diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2020-02-26 14:09:52 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2020-02-26 14:10:47 +0100 |
| commit | 069c2e86b21e24e05d3ef8b333d50550a38fa5e2 (patch) | |
| tree | f81e4e810f1ddf4fb4434a4815104311a4f87b9e | |
| parent | 0d775d8f2a8a8cb701fe97c76d76892761c29aa7 (diff) | |
Rename pkgSimulate::Go2 to pkgSimulate::Go
| -rw-r--r-- | apt-pkg/algorithms.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/algorithms.h | 3 | ||||
| -rw-r--r-- | apt-pkg/packagemanager.cc | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 4d4adde3c..f2977b9af 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -260,7 +260,7 @@ void pkgSimulate::ShortBreaks() cout << ']' << endl; } /*}}}*/ -bool pkgSimulate::Go2(APT::Progress::PackageManager *) /*{{{*/ +bool pkgSimulate::Go(APT::Progress::PackageManager *) /*{{{*/ { if (pkgDPkgPM::ExpandPendingCalls(d->List, Cache) == false) return false; diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 789f304a9..1672231ff 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -71,9 +71,8 @@ class pkgSimulate : public pkgPackageManager /*{{{*/ virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE; virtual bool Remove(PkgIterator Pkg,bool Purge) APT_OVERRIDE; - // FIXME: trick to avoid ABI break for virtual reimplementation; fix on next ABI break public: - APT_HIDDEN bool Go2(APT::Progress::PackageManager * progress); + bool Go(APT::Progress::PackageManager * progress) override; private: APT_HIDDEN void ShortBreaks(); diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index e58589d73..b601172b0 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -1130,11 +1130,7 @@ pkgPackageManager::OrderResult pkgPackageManager::DoInstallPostFork(APT::Progress::PackageManager *progress) { bool goResult; - auto simulation = dynamic_cast<pkgSimulate*>(this); - if (simulation == nullptr) - goResult = Go(progress); - else - goResult = simulation->Go2(progress); + goResult = Go(progress); if(goResult == false) return Failed; |