diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2020-02-26 13:59:12 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2020-02-26 14:10:47 +0100 |
| commit | e886ff0a6e66362e1a8f8c53977bf062cec0da12 (patch) | |
| tree | 1255c1e0c9e52713ba22068208b72c973bb7f649 | |
| parent | b2eec2572ce1c8e79ac3a270161cc5d415169840 (diff) | |
Remove ABI workaround for debDebPkgFileIndex::ArchiveInfo
| -rw-r--r-- | apt-pkg/deb/debindexfile.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/deb/debindexfile.h | 3 | ||||
| -rw-r--r-- | apt-pkg/indexfile.cc | 5 |
3 files changed, 3 insertions, 7 deletions
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index e4ceebff2..43317d314 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -246,7 +246,7 @@ pkgCache::PkgFileIterator debDebPkgFileIndex::FindInCache(pkgCache &Cache) const return File; } -std::string debDebPkgFileIndex::ArchiveInfo_impl(pkgCache::VerIterator const &Ver) const +std::string debDebPkgFileIndex::ArchiveInfo(pkgCache::VerIterator const &Ver) const { std::string Res = IndexFileName() + " "; Res.append(Ver.ParentPkg().Name()).append(" "); diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index 222fed229..3ef9f6b0c 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -144,8 +144,7 @@ public: explicit debDebPkgFileIndex(std::string const &DebFile); virtual ~debDebPkgFileIndex(); - //FIXME: use proper virtual-handling on next ABI break - APT_HIDDEN std::string ArchiveInfo_impl(pkgCache::VerIterator const &Ver) const; + std::string ArchiveInfo(pkgCache::VerIterator const &Ver) const override; }; class debDscFileIndex : public pkgDebianIndexRealFile diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index a7290c653..ef3486ab8 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -65,11 +65,8 @@ pkgIndexFile::pkgIndexFile(bool const Trusted) : /*{{{*/ } /*}}}*/ // IndexFile::ArchiveInfo - Stub /*{{{*/ -std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator const &Ver) const +std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator const &) const { - debDebPkgFileIndex const * const debfile = dynamic_cast<debDebPkgFileIndex const*>(this); - if (debfile != nullptr) - return debfile->ArchiveInfo_impl(Ver); return std::string(); } /*}}}*/ |