Fix a segfault in the version merger introduced in the previous patch:

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

diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index d313f78a61461e3414d57faa9f2d6f97ddd46959..56fb67887857416b94637807fcfe02a4f2b6eb4f 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);