releasing package apt version 1.0.5

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

diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index 40ebd3f704f9ae4aa778ae44d438d488b78e9ad5..f15d8c0a019e8bcf8c748235651b26101a2b82b3 100644 (file)
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -33,15 +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/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
 {


@@ -50,42 +52,43 @@ 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;
+      PkgPin(std::string const &Pkg) : Pin(), Pkg(Pkg) {};

    };
    
    Pin *Pins;
    signed short *PFPriority;
    };
    
    Pin *Pins;
    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);
-   inline signed short GetPriority(pkgCache::PkgFileIterator const &File) 
-       {return PFPriority[File->ID];};
-   signed short GetPriority(pkgCache::PkgIterator const &Pkg);
-   pkgCache::VerIterator GetMatch(pkgCache::PkgIterator Pkg);
+   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.
 
    // Things for the cache interface.

-   virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator Pkg);
-   virtual bool IsImportantDep(pkgCache::DepIterator Dep) {return pkgDepCache::Policy::IsImportantDep(Dep);};
+   virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg);
+   virtual signed short GetPriority(pkgCache::PkgIterator const &Pkg);
+   virtual signed short GetPriority(pkgCache::PkgFileIterator const &File);
+

    bool InitDefaults();
    
    pkgPolicy(pkgCache *Owner);
    virtual ~pkgPolicy() {delete [] PFPriority; delete [] Pins;};
 };
 
    bool InitDefaults();
    
    pkgPolicy(pkgCache *Owner);
    virtual ~pkgPolicy() {delete [] PFPriority; delete [] Pins;};
 };
 

-bool ReadPinFile(pkgPolicy &Plcy,string File = "");
+bool ReadPinFile(pkgPolicy &Plcy, std::string File = "");
+bool ReadPinDir(pkgPolicy &Plcy, std::string Dir = "");

 
 #endif
 
 #endif