X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/859110cdec2f211beb45305134d095fd8926d552..1bae10217617c2f79969635d4387fb2a5fe19ecb:/apt-pkg/version.h?ds=sidebyside diff --git a/apt-pkg/version.h b/apt-pkg/version.h index 49c53a93a..5110ecaa7 100644 --- a/apt-pkg/version.h +++ b/apt-pkg/version.h @@ -20,11 +20,12 @@ #ifndef PKGLIB_VERSION_H #define PKGLIB_VERSION_H - -#include <apt-pkg/strutl.h> +#include <apt-pkg/strutl.h> #include <string> +#ifndef APT_8_CLEANER_HEADERS using std::string; +#endif class pkgVersioningSystem { @@ -32,7 +33,7 @@ class pkgVersioningSystem // 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; @@ -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 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) @@ -54,11 +55,7 @@ class pkgVersioningSystem APT_MKSTRCMP(CmpReleaseVer,DoCmpReleaseVer); pkgVersioningSystem(); - virtual ~pkgVersioningSystem() {}; + virtual ~pkgVersioningSystem(); }; -#ifdef APT_COMPATIBILITY -#include <apt-pkg/debversion.h> -#endif - #endif