summaryrefslogtreecommitdiff
path: root/apt-pkg/acquire.cc
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2019-02-26 12:42:42 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2019-02-26 16:31:20 +0100
commit91e1f7d49830289d8e9d3fdd7ebbe7544a9838b8 (patch)
tree30bf0e0e803377afcea8a619342ce887377ea2a6 /apt-pkg/acquire.cc
parent975316780b2ba3d4e60592fac9d4eb99ffc4c924 (diff)
acquire: Fold pkgAcquireStatus2 into pkgAcquireStatus
Clean up the code, make it neat, lalala
Diffstat (limited to 'apt-pkg/acquire.cc')
-rw-r--r--apt-pkg/acquire.cc11
1 files changed, 2 insertions, 9 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 541785b03..fc256b39e 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -1444,9 +1444,8 @@ void pkgAcquireStatus::Fetched(unsigned long long Size,unsigned long long Resume
/*}}}*/
bool pkgAcquireStatus::ReleaseInfoChanges(metaIndex const * const LastRelease, metaIndex const * const CurrentRelease, std::vector<ReleaseInfoChange> &&Changes)/*{{{*/
{
- auto const virt = dynamic_cast<pkgAcquireStatus2*>(this);
- if (virt != nullptr)
- return virt->ReleaseInfoChanges(LastRelease, CurrentRelease, std::move(Changes));
+ (void) LastRelease;
+ (void) CurrentRelease;
return ReleaseInfoChangesAsGlobalErrors(std::move(Changes));
}
/*}}}*/
@@ -1464,12 +1463,6 @@ bool pkgAcquireStatus::ReleaseInfoChangesAsGlobalErrors(std::vector<ReleaseInfoC
return AllOkay;
}
/*}}}*/
-bool pkgAcquireStatus2::ReleaseInfoChanges(metaIndex const * const, metaIndex const * const, std::vector<ReleaseInfoChange> &&Changes)
-{
- return ReleaseInfoChangesAsGlobalErrors(std::move(Changes));
-}
-pkgAcquireStatus2::pkgAcquireStatus2() : pkgAcquireStatus() {}
-pkgAcquireStatus2::~pkgAcquireStatus2() {}
pkgAcquire::UriIterator::UriIterator(pkgAcquire::Queue *Q) : d(NULL), CurQ(Q), CurItem(0)