X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/851a45a85fa486abc642e10f19afef11f621c29d..1f31762e69fd52fc67306d4b8af98c4e4519e2e4:/apt-pkg/version.h?ds=inline diff --git a/apt-pkg/version.h b/apt-pkg/version.h index 4c37ba8f8..49c53a93a 100644 --- a/apt-pkg/version.h +++ b/apt-pkg/version.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: version.h,v 1.7 2001/05/14 05:58:33 jgg Exp $ +// $Id: version.h,v 1.8 2001/05/27 05:55:27 jgg Exp $ /* ###################################################################### Version - Versioning system.. @@ -20,10 +20,8 @@ #ifndef PKGLIB_VERSION_H #define PKGLIB_VERSION_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/version.h" -#endif +#include <apt-pkg/strutl.h> #include <string> using std::string; @@ -52,22 +50,8 @@ class pkgVersioningSystem {return this == &Against;}; // Shortcuts - inline int CmpVersion(const char *A, const char *B) - { - return DoCmpVersion(A,A+strlen(A),B,B+strlen(B)); - }; - inline int CmpVersion(string A,string B) - { - return DoCmpVersion(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length()); - }; - inline int CmpReleaseVer(const char *A, const char *B) - { - return DoCmpReleaseVer(A,A+strlen(A),B,B+strlen(B)); - }; - inline int CmpReleaseVer(string A,string B) - { - return DoCmpReleaseVer(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length()); - }; + APT_MKSTRCMP(CmpVersion,DoCmpVersion); + APT_MKSTRCMP(CmpReleaseVer,DoCmpReleaseVer); pkgVersioningSystem(); virtual ~pkgVersioningSystem() {};