Updated translations

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

diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index 4c37ba8f868625266633ed74dc03495eb5968e0e..49c53a93a8073041a4f2fe1ec43117c8f3c1e77f 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.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..
 /* ######################################################################
 
    Version - Versioning system..


@@ -20,10 +20,8 @@
 #ifndef PKGLIB_VERSION_H
 #define PKGLIB_VERSION_H
 
 #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;
 #include <string>
 
 using std::string;


@@ -52,22 +50,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.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() {};
    
    pkgVersioningSystem();
    virtual ~pkgVersioningSystem() {};