make setup in travis.yml a bit more verbose

[apt.git] / apt-pkg / deb / debversion.h

diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index d313f78a61461e3414d57faa9f2d6f97ddd46959..f1d6f3cc55df54fb25836190de6c89d84e1331d6 100644 (file)
--- a/apt-pkg/deb/debversion.h
+++ b/apt-pkg/deb/debversion.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debversion.h,v 1.2 2001/02/20 07:03:17 jgg Exp $
+// $Id: debversion.h,v 1.3 2001/05/03 05:25:04 jgg Exp $

 /* ######################################################################
 
    Debian Version - Versioning system for Debian
 /* ######################################################################
 
    Debian Version - Versioning system for Debian


@@ -12,19 +12,17 @@
 #ifndef PKGLIB_DEBVERSION_H
 #define PKGLIB_DEBVERSION_H
 
 #ifndef PKGLIB_DEBVERSION_H
 #define PKGLIB_DEBVERSION_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/debversion.h"
-#endif 
+

 
 #include <apt-pkg/version.h>
     
 class debVersioningSystem : public pkgVersioningSystem
 
 #include <apt-pkg/version.h>
     
 class debVersioningSystem : public pkgVersioningSystem

-{  
+{     
+   public:
+   

    static int CmpFragment(const char *A, const char *AEnd, const char *B,
                          const char *BEnd);
    
    static int CmpFragment(const char *A, const char *AEnd, const char *B,
                          const char *BEnd);
    

-   public:
-   

    // Compare versions..
    virtual int DoCmpVersion(const char *A,const char *Aend,
                          const char *B,const char *Bend);
    // Compare versions..
    virtual int DoCmpVersion(const char *A,const char *Aend,
                          const char *B,const char *Bend);


@@ -34,39 +32,11 @@ class debVersioningSystem : public pkgVersioningSystem
    {
       return DoCmpVersion(A,Aend,B,Bend);
    }   
    {
       return DoCmpVersion(A,Aend,B,Bend);
    }   

-   virtual string UpstreamVersion(const char *A);
+   virtual std::string UpstreamVersion(const char *A);

 
    debVersioningSystem();
 };
 
 extern debVersioningSystem debVS;
 
 
    debVersioningSystem();
 };
 
 extern debVersioningSystem debVS;
 

-#ifdef APT_COMPATIBILITY
-#if APT_COMPATIBILITY != 986
-#warning "Using APT_COMPATIBILITY"
-#endif
-
-inline int pkgVersionCompare(const char *A, const char *B)
-{
-   return debVS.CmpVersion(A,B);
-}
-inline int pkgVersionCompare(const char *A, const char *AEnd, 
-                            const char *B, const char *BEnd)
-{
-   return debVS.DoCmpVersion(A,AEnd,B,BEnd);
-}
-inline int pkgVersionCompare(string A,string B)
-{
-   return debVS.CmpVersion(A,B);
-}
-inline bool pkgCheckDep(const char *DepVer,const char *PkgVer,int Op)
-{
-   return debVS.CheckDep(PkgVer,Op,DepVer);
-}
-inline string pkgBaseVersion(const char *Ver)
-{
-   return debVS.UpstreamVersion(Ver);
-}
-#endif
-

 #endif
 #endif