diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 13:10:14 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:20 +0100 |
| commit | 7062f2a5a1bdb8c0e3c4b3b004e092046d1034ba (patch) | |
| tree | 8e91a412e50e9ac0f08d9f022f544630f0f73f92 | |
| parent | 0035243ae63ccb22476624ea4294798258377f85 (diff) | |
depcache: Remove deprecated functions
| -rw-r--r-- | apt-pkg/depcache.cc | 15 | ||||
| -rw-r--r-- | apt-pkg/depcache.h | 4 | ||||
| -rw-r--r-- | debian/libapt-pkg6.0.symbols | 1 |
3 files changed, 0 insertions, 20 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 510f2d3f0..052e3de0e 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1723,21 +1723,6 @@ void pkgDepCache::StateCache::Update(PkgIterator Pkg,pkgCache &Cache) Status = 2; } /*}}}*/ -// StateCache::StripEpoch - Remove the epoch specifier from the version /*{{{*/ -// --------------------------------------------------------------------- -/* */ -const char *pkgDepCache::StateCache::StripEpoch(const char *Ver) -{ - if (Ver == 0) - return 0; - - // Strip any epoch - char const * const I = strchr(Ver, ':'); - if (I == nullptr) - return Ver; - return I + 1; -} - /*}}}*/ // Policy::GetCandidateVer - Returns the Candidate install version /*{{{*/ // --------------------------------------------------------------------- /* The default just returns the highest available version that is not diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 724bf566e..3013c0ddb 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -243,7 +243,6 @@ class pkgDepCache : protected pkgCache::Namespace unsigned char DepState; // DepState Flags // Update of candidate version - APT_DEPRECATED_MSG("Use the method of the same name in contrib/strutl.h instead if you must") const char *StripEpoch(const char *Ver) APT_PURE; void Update(PkgIterator Pkg,pkgCache &Cache); // Various test members for the current status of the package @@ -364,9 +363,6 @@ class pkgDepCache : protected pkgCache::Namespace inline pkgCache &GetCache() {return *Cache;}; inline pkgVersioningSystem &VS() {return *Cache->VS;}; - // Policy implementation - APT_DEPRECATED_MSG("Confusingly named method which returns the candidate as chosen by policy (NOT as chosen via .SetCandidateVersion!). You probably want to use .GetCandidateVersion instead.") inline VerIterator GetCandidateVer(PkgIterator const &Pkg) {return /* GetCandidateVersion(Pkg); but for API compat: */ LocalPolicy->GetCandidateVer(Pkg);}; - inline bool IsImportantDep(DepIterator Dep) const {return LocalPolicy->IsImportantDep(Dep);}; inline Policy &GetPolicy() {return *LocalPolicy;}; diff --git a/debian/libapt-pkg6.0.symbols b/debian/libapt-pkg6.0.symbols index 23ec4bc26..4c2e44fae 100644 --- a/debian/libapt-pkg6.0.symbols +++ b/debian/libapt-pkg6.0.symbols @@ -173,7 +173,6 @@ libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER# (c++)"PackageCopy::~PackageCopy()@APTPKG_6.0" 0.8.0 (c++)"pkgDepCache::IsDeleteOk(pkgCache::PkgIterator const&, bool, unsigned long, bool)@APTPKG_6.0" 0.8.0 (c++)"pkgDepCache::MarkDelete(pkgCache::PkgIterator const&, bool, unsigned long, bool)@APTPKG_6.0" 0.8.0 - (c++)"pkgDepCache::StateCache::StripEpoch(char const*)@APTPKG_6.0" 0.8.0 (c++)"pkgDepCache::StateCache::Update(pkgCache::PkgIterator, pkgCache&)@APTPKG_6.0" 0.8.0 (c++)"pkgDepCache::ActionGroup::release()@APTPKG_6.0" 0.8.0 (c++)"pkgDepCache::ActionGroup::ActionGroup(pkgDepCache&)@APTPKG_6.0" 0.8.0 |