Bug #807012 also involves package dependencies :/.

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

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

-// $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,59 +11,31 @@
 #ifndef PKGLIB_DEBVERSION_H
 #define PKGLIB_DEBVERSION_H
 
 #ifndef PKGLIB_DEBVERSION_H
 #define PKGLIB_DEBVERSION_H
 

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

 
 

+#include <string>

 
 

-#include <apt-pkg/version.h>
-    

 class debVersioningSystem : public pkgVersioningSystem
 class debVersioningSystem : public pkgVersioningSystem

-{     
+{

    public:
    public:

-   
+

    static int CmpFragment(const char *A, const char *AEnd, const char *B,
    static int CmpFragment(const char *A, const char *AEnd, const char *B,

-                         const char *BEnd);
-   
+                         const char *BEnd) APT_PURE;
+

    // Compare versions..
    virtual int DoCmpVersion(const char *A,const char *Aend,
    // Compare versions..
    virtual int DoCmpVersion(const char *A,const char *Aend,

-                         const char *B,const char *Bend);
-   virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer);
-   virtual int DoCmpReleaseVer(const char *A,const char *Aend,
-                            const char *B,const char *Bend)
+                         const char *B,const char *Bend) APT_OVERRIDE APT_PURE;
+   virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) APT_OVERRIDE APT_PURE;
+   virtual APT_PURE int DoCmpReleaseVer(const char *A,const char *Aend,
+                            const char *B,const char *Bend) APT_OVERRIDE

    {
       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) APT_OVERRIDE;

 
    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