diff options
| author | Michael Vogt <mvo@debian.org> | 2015-08-18 11:57:35 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-08-18 11:57:35 +0200 |
| commit | b53c9cea2902572822bbbece5bac236c1bbf846e (patch) | |
| tree | 6c6b0524e0971c0623ccbff71383523ee0b2a5cc /apt-pkg/policy.h | |
| parent | 21248c0f00ee71412dbadc6ebf84011cf974346d (diff) | |
| parent | 2a22cd60f04c4291ea9b9b72e15b6d2ec378b001 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/srv-records
Diffstat (limited to 'apt-pkg/policy.h')
| -rw-r--r-- | apt-pkg/policy.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index f15d8c0a0..bb0ff7e27 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: policy.h,v 1.4 2001/05/07 04:24:08 jgg Exp $ /* ###################################################################### Package Version Policy implementation @@ -60,10 +59,11 @@ class pkgPolicy : public pkgDepCache::Policy struct PkgPin : Pin { std::string Pkg; - PkgPin(std::string const &Pkg) : Pin(), Pkg(Pkg) {}; + explicit PkgPin(std::string const &Pkg) : Pin(), Pkg(Pkg) {}; }; Pin *Pins; + Pin *VerPins; signed short *PFPriority; std::vector<Pin> Defaults; std::vector<PkgPin> Unmatched; @@ -78,14 +78,18 @@ class pkgPolicy : public pkgDepCache::Policy pkgCache::VerIterator GetMatch(pkgCache::PkgIterator const &Pkg); // Things for the cache interface. - virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg); - virtual signed short GetPriority(pkgCache::PkgIterator const &Pkg); - virtual signed short GetPriority(pkgCache::PkgFileIterator const &File); + virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + virtual signed short GetPriority(pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + virtual signed short GetPriority(pkgCache::VerIterator const &Ver, bool ConsiderFiles = true) APT_OVERRIDE; + virtual signed short GetPriority(pkgCache::PkgFileIterator const &File) APT_OVERRIDE; bool InitDefaults(); - pkgPolicy(pkgCache *Owner); - virtual ~pkgPolicy() {delete [] PFPriority; delete [] Pins;}; + explicit pkgPolicy(pkgCache *Owner); + virtual ~pkgPolicy(); + private: + APT_HIDDEN pkgCache::VerIterator GetCandidateVerNew(pkgCache::PkgIterator const &Pkg); + void * const d; }; bool ReadPinFile(pkgPolicy &Plcy, std::string File = ""); |