HttpsMethod::Fetch(): Zero the FetchResult object when leaving due to 404

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

diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index 56fb67887857416b94637807fcfe02a4f2b6eb4f..434ff4a2e4c06779c30247ff3b6760b5db625367 100644 (file)
--- a/apt-pkg/deb/debversion.h
+++ b/apt-pkg/deb/debversion.h
@@ -12,59 +12,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) APT_PURE;
+   virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) APT_PURE;
+   virtual APT_PURE int DoCmpReleaseVer(const char *A,const char *Aend,

                             const char *B,const char *Bend)
    {
       return DoCmpVersion(A,Aend,B,Bend);
                             const char *B,const char *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