* undo some of the bzr merge damage from the last merge

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

diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index 27e8e1f1bc016c7644eb2ae0dfd585572d30a6df..071dba3e2faa8aa8d0006bcd15afd2afef0bccc8 100644 (file)
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: version.h,v 1.6 2001/02/20 07:03:17 jgg Exp $
+// $Id: version.h,v 1.8 2001/05/27 05:55:27 jgg Exp $

 /* ######################################################################
 
    Version - Versioning system..
 /* ######################################################################
 
    Version - Versioning system..


@@ -24,8 +24,11 @@
 #pragma interface "apt-pkg/version.h"
 #endif 
 
 #pragma interface "apt-pkg/version.h"
 #endif 
 

+#include <apt-pkg/strutl.h>    

 #include <string>
 
 #include <string>
 

+using std::string;
+

 class pkgVersioningSystem
 {
    public:
 class pkgVersioningSystem
 {
    public:


@@ -39,6 +42,7 @@ class pkgVersioningSystem
    // Compare versions..
    virtual int DoCmpVersion(const char *A,const char *Aend,
                          const char *B,const char *Bend) = 0;   
    // Compare versions..
    virtual int DoCmpVersion(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 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;


@@ -49,22 +53,8 @@ class pkgVersioningSystem
                 {return this == &Against;};
 
    // Shortcuts
                 {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.begin(),A.end(),B.begin(),B.end());
-   };  
-   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.begin(),A.end(),B.begin(),B.end());
-   };  
+   APT_MKSTRCMP(CmpVersion,DoCmpVersion);
+   APT_MKSTRCMP(CmpReleaseVer,DoCmpReleaseVer);

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