diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:56:21 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:56:21 +0100 |
| commit | 7cb543fb742a837c4931513674febaec5e4c1401 (patch) | |
| tree | ddefe5b9329907818aa6eb3b593f555b29ccb869 /apt-pkg/version.h | |
| parent | f6cb0880a4b5d31e398cceb2e2577b6b82f4fffb (diff) | |
| parent | 71ecaad29d8066a494f516efc5efd80860653fe2 (diff) | |
merged from lp:~mvo/apt/mvo (that has all the changes from debian-experimental2) and resolved a bunch of conflicts
Diffstat (limited to 'apt-pkg/version.h')
| -rw-r--r-- | apt-pkg/version.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/apt-pkg/version.h b/apt-pkg/version.h index 49c53a93a..92dbc2576 100644 --- a/apt-pkg/version.h +++ b/apt-pkg/version.h @@ -20,12 +20,9 @@ #ifndef PKGLIB_VERSION_H #define PKGLIB_VERSION_H - -#include <apt-pkg/strutl.h> +#include <apt-pkg/strutl.h> #include <string> -using std::string; - 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 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) @@ -57,8 +54,4 @@ class pkgVersioningSystem virtual ~pkgVersioningSystem() {}; }; -#ifdef APT_COMPATIBILITY -#include <apt-pkg/debversion.h> -#endif - #endif |