merge with current debian apt/experimental

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

diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index 49c53a93a8073041a4f2fe1ec43117c8f3c1e77f..92dbc2576732edde7bd8c17bdf3375f000b8c185 100644 (file)
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -20,12 +20,9 @@
 #ifndef PKGLIB_VERSION_H
 #define PKGLIB_VERSION_H
 
 #ifndef PKGLIB_VERSION_H
 #define PKGLIB_VERSION_H
 

-
-#include <apt-pkg/strutl.h>    
+#include <apt-pkg/strutl.h>

 #include <string>
 
 #include <string>
 

-using std::string;
-

 class pkgVersioningSystem
 {
    public:
 class pkgVersioningSystem
 {
    public:


@@ -43,7 +40,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) 


@@ -57,8 +54,4 @@ class pkgVersioningSystem
    virtual ~pkgVersioningSystem() {};
 };
 
    virtual ~pkgVersioningSystem() {};
 };
 

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

 #endif
 #endif