cleanup the debian/rules file a bit

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

diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index f8991620236f275d0e798e811f158c329d3eb8e7..f8b2678de434997d9d5825fda8c1588376b33a33 100644 (file)
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: policy.h,v 1.2 2001/02/20 07:03:17 jgg Exp $
+// $Id: policy.h,v 1.4 2001/05/07 04:24:08 jgg Exp $

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


@@ -33,16 +33,17 @@
 #ifndef PKGLIB_POLICY_H
 #define PKGLIB_POLICY_H
 
 #ifndef PKGLIB_POLICY_H
 #define PKGLIB_POLICY_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/policy.h"
-#endif

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

+using std::vector;
+

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

+   protected:
+

    struct Pin
    {
       pkgVersionMatch::MatchType Type;
    struct Pin
    {
       pkgVersionMatch::MatchType Type;


@@ -56,8 +57,6 @@ class pkgPolicy : public pkgDepCache::Policy
       string Pkg;
    };
    
       string Pkg;
    };
    

-   protected:
-   

    Pin *Pins;
    signed short *PFPriority;
    vector<Pin> Defaults;
    Pin *Pins;
    signed short *PFPriority;
    vector<Pin> Defaults;


@@ -67,11 +66,17 @@ class pkgPolicy : public pkgDepCache::Policy
    
    public:
 
    
    public:
 

+   // Things for manipulating pins

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

-   
-   virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator Pkg);
-   virtual bool IsImportantDep(pkgCache::DepIterator Dep) {return pkgDepCache::Policy::IsImportantDep(Dep);};
+   inline signed short GetPriority(pkgCache::PkgFileIterator const &File) 
+       {return PFPriority[File->ID];};
+   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 bool IsImportantDep(pkgCache::DepIterator const &Dep) {return pkgDepCache::Policy::IsImportantDep(Dep);};

    bool InitDefaults();
    
    pkgPolicy(pkgCache *Owner);
    bool InitDefaults();
    
    pkgPolicy(pkgCache *Owner);


@@ -79,5 +84,6 @@ class pkgPolicy : public pkgDepCache::Policy
 };
 
 bool ReadPinFile(pkgPolicy &Plcy,string File = "");
 };
 
 bool ReadPinFile(pkgPolicy &Plcy,string File = "");

+bool ReadPinDir(pkgPolicy &Plcy,string Dir = "");

 
 #endif
 
 #endif