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 c9257d1163264adab8cff53a24c5877211b49bf0..5110ecaa7d9f8d0ed4e11dd1534209faca6599f4 100644 (file)
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -20,17 +20,20 @@
 #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;
+#endif
+

 class pkgVersioningSystem
 {
    public:
    // Global list of VS's
    static pkgVersioningSystem **GlobalList;
    static unsigned long GlobalListLen;
 class pkgVersioningSystem
 {
    public:
    // 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;
    


@@ -52,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