ensure Cnf::FindFile doesn't return files below /dev/null

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

diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index 49c53a93a8073041a4f2fe1ec43117c8f3c1e77f..5110ecaa7d9f8d0ed4e11dd1534209faca6599f4 100644 (file)
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -20,11 +20,12 @@
 #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>
 

+#ifndef APT_8_CLEANER_HEADERS

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

+#endif

 
 class pkgVersioningSystem
 {
 
 class pkgVersioningSystem
 {


@@ -32,7 +33,7 @@ class pkgVersioningSystem
    // Global list of VS's
    static pkgVersioningSystem **GlobalList;
    static unsigned long GlobalListLen;
    // Global list of VS's
    static pkgVersioningSystem **GlobalList;
    static unsigned long GlobalListLen;

-   static pkgVersioningSystem *GetVS(const char *Label);
+   static pkgVersioningSystem *GetVS(const char *Label) APT_PURE;

    
    const char *Label;
    
    
    const char *Label;
    


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


@@ -54,11 +55,7 @@ class pkgVersioningSystem
    APT_MKSTRCMP(CmpReleaseVer,DoCmpReleaseVer);
    
    pkgVersioningSystem();
    APT_MKSTRCMP(CmpReleaseVer,DoCmpReleaseVer);
    
    pkgVersioningSystem();

-   virtual ~pkgVersioningSystem() {};
+   virtual ~pkgVersioningSystem();

 };
 
 };
 

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

 #endif
 #endif