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 e7f36d6187ee2e4537caa2a1fb57c689de14cfae..58b062a7b516e3c404fa49e807f6f0ca9c4ed5ad 100644 (file)
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: policy.h,v 1.4 2001/05/07 04:24:08 jgg Exp $

 /* ######################################################################
 
    Package Version Policy implementation
 /* ######################################################################
 
    Package Version Policy implementation


@@ -33,12 +32,17 @@
 #ifndef PKGLIB_POLICY_H
 #define PKGLIB_POLICY_H
 
 #ifndef PKGLIB_POLICY_H
 #define PKGLIB_POLICY_H
 

-

 #include <apt-pkg/depcache.h>
 #include <apt-pkg/depcache.h>

+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>

 #include <apt-pkg/versionmatch.h>
 #include <apt-pkg/versionmatch.h>

+

 #include <vector>
 #include <vector>

+#include <string>

 
 

+#ifndef APT_8_CLEANER_HEADERS

 using std::vector;
 using std::vector;

+#endif

 
 class pkgPolicy : public pkgDepCache::Policy
 {
 
 class pkgPolicy : public pkgDepCache::Policy
 {


@@ -47,42 +51,48 @@ class pkgPolicy : public pkgDepCache::Policy
    struct Pin
    {
       pkgVersionMatch::MatchType Type;
    struct Pin
    {
       pkgVersionMatch::MatchType Type;

-      string Data;
+      std::string Data;

       signed short Priority;
       Pin() : Type(pkgVersionMatch::None), Priority(0) {};
    };
 
    struct PkgPin : Pin
    {
       signed short Priority;
       Pin() : Type(pkgVersionMatch::None), Priority(0) {};
    };
 
    struct PkgPin : Pin
    {

-      string Pkg;
+      std::string Pkg;
+      explicit PkgPin(std::string const &Pkg) : Pin(), Pkg(Pkg) {};

    };
    
    Pin *Pins;
    };
    
    Pin *Pins;

+   Pin *VerPins;

    signed short *PFPriority;
    signed short *PFPriority;

-   vector<Pin> Defaults;
-   vector<PkgPin> Unmatched;
+   std::vector<Pin> Defaults;
+   std::vector<PkgPin> Unmatched;

    pkgCache *Cache;
    bool StatusOverride;
    
    public:
 
    // Things for manipulating pins
    pkgCache *Cache;
    bool StatusOverride;
    
    public:
 
    // Things for manipulating pins

-   void CreatePin(pkgVersionMatch::MatchType Type,string Pkg,
-                 string Data,signed short Priority);
+   void CreatePin(pkgVersionMatch::MatchType Type,std::string Pkg,
+                 std::string Data,signed short Priority);

    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);
    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::VerIterator const &Pkg);

    virtual signed short GetPriority(pkgCache::PkgFileIterator const &File);
 
    bool InitDefaults();
    
    virtual signed short GetPriority(pkgCache::PkgFileIterator const &File);
 
    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,string File = "");
-bool ReadPinDir(pkgPolicy &Plcy,string Dir = "");
+bool ReadPinFile(pkgPolicy &Plcy, std::string File = "");
+bool ReadPinDir(pkgPolicy &Plcy, std::string Dir = "");

 
 #endif
 
 #endif