[ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines

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

diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index 071dba3e2faa8aa8d0006bcd15afd2afef0bccc8..e0e0e6c1410f87f86d1aa41527306bc3c4ea907f 100644 (file)
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -20,14 +20,12 @@
 #ifndef PKGLIB_VERSION_H
 #define PKGLIB_VERSION_H
 
 #ifndef PKGLIB_VERSION_H
 #define PKGLIB_VERSION_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/version.h"
-#endif 
-
-#include <apt-pkg/strutl.h>    
+#include <apt-pkg/strutl.h>

 #include <string>
 
 #include <string>
 

+#ifndef APT_8_CLEANER_HEADERS

 using std::string;
 using std::string;

+#endif

 
 class pkgVersioningSystem
 {
 
 class pkgVersioningSystem
 {


@@ -46,7 +44,7 @@ class pkgVersioningSystem
    virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) = 0;
    virtual int DoCmpReleaseVer(const char *A,const char *Aend,
                               const char *B,const char *Bend) = 0;
    virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) = 0;
    virtual int DoCmpReleaseVer(const char *A,const char *Aend,
                               const char *B,const char *Bend) = 0;

-   virtual string UpstreamVersion(const char *A) = 0;
+   virtual std::string UpstreamVersion(const char *A) = 0;

    
    // See if the given VS is compatible with this one.. 
    virtual bool TestCompatibility(pkgVersioningSystem const &Against) 
    
    // See if the given VS is compatible with this one.. 
    virtual bool TestCompatibility(pkgVersioningSystem const &Against) 


@@ -60,8 +58,4 @@ class pkgVersioningSystem
    virtual ~pkgVersioningSystem() {};
 };
 
    virtual ~pkgVersioningSystem() {};
 };
 

-#ifdef APT_COMPATIBILITY
-#include <apt-pkg/debversion.h>
-#endif
-

 #endif
 #endif