[ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines

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

diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index 92d32728f7a27392b99f4d90b9ea89e88f954eeb..5172a3c3b9419b5759e8ea701d503c659984c6c5 100644 (file)
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -38,7 +38,9 @@
 #include <apt-pkg/versionmatch.h>
 #include <vector>
 
 #include <apt-pkg/versionmatch.h>
 #include <vector>
 

+#ifndef APT_8_CLEANER_HEADERS

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

+#endif

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


@@ -47,29 +49,29 @@ 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;
-      PkgPin(string const &Pkg) : Pin(), Pkg(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);
+   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.
    pkgCache::VerIterator GetMatch(pkgCache::PkgIterator const &Pkg);
 
    // Things for the cache interface.


@@ -83,7 +85,7 @@ class pkgPolicy : public pkgDepCache::Policy
    virtual ~pkgPolicy() {delete [] PFPriority; delete [] Pins;};
 };
 
    virtual ~pkgPolicy() {delete [] PFPriority; delete [] Pins;};
 };
 

-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