add sources.list Check-Valid-Until and Valid-Until-{Max,Min} options

[apt.git] / apt-pkg / policy.h

diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index c4b1cbaddf3caa285e6a58c2e2774f26423be2e9..58b062a7b516e3c404fa49e807f6f0ca9c4ed5ad 100644 (file)
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -59,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;
@@ -79,14 +80,16 @@ class pkgPolicy : public pkgDepCache::Policy
    // 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::VerIterator const &Pkg);
    virtual signed short GetPriority(pkgCache::PkgFileIterator const &File);
 
    bool InitDefaults();
    
-   pkgPolicy(pkgCache *Owner);
+   explicit pkgPolicy(pkgCache *Owner);
    virtual ~pkgPolicy();
    private:
-   void *d;
+   APT_HIDDEN pkgCache::VerIterator GetCandidateVerNew(pkgCache::PkgIterator const &Pkg);
+   void * const d;
 };
 
 bool ReadPinFile(pkgPolicy &Plcy, std::string File = "");