unmet

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

diff --git a/apt-pkg/version.cc b/apt-pkg/version.cc
index 174622c91b3181b9a409345079b2033f93720c94..ce6d596db324d1e477a42eb024d9f30b2429fa22 100644 (file)
--- a/apt-pkg/version.cc
+++ b/apt-pkg/version.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: version.cc,v 1.2 1998/07/04 05:57:40 jgg Exp $
+// $Id: version.cc,v 1.5 1998/07/19 21:24:18 jgg Exp $
 /* ######################################################################
 
    Version - Version string 
@@ -17,45 +17,16 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
-#include <pkglib/version.h>
-#include <pkglib/pkgcache.h>
+#ifdef __GNUG__
+#pragma implementation "apt-pkg/version.h"
+#endif 
+
+#include <apt-pkg/version.h>
+#include <apt-pkg/pkgcache.h>
 
 #include <stdlib.h>
                                                                        /*}}}*/
 
-// Version::pkgVersion - Default Constructor                           /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgVersion::pkgVersion()
-{
-}
-                                                                       /*}}}*/
-// Version::operator == - Checks if two versions are equal             /*{{{*/
-// ---------------------------------------------------------------------
-/* We can't simply perform a string compare because of epochs. */
-bool pkgVersion::operator ==(const pkgVersion &Vrhs) const
-{
-   if (pkgVersionCompare(Value.begin(),Value.end(),
-                    Vrhs.Value.begin(),Vrhs.Value.end()) == 0)
-      return true;
-   return false;
-}
-                                                                       /*}}}*/
-// Version::operator < - Checks if this is less than another version   /*{{{*/
-// ---------------------------------------------------------------------
-/* All other forms of comparision can be built up from this single function.
-    a > b -> b < a
-    a <= b -> !(a > b) -> !(b < a)
-    a >= b -> !(a < b) 
- */
-bool pkgVersion::operator <(const pkgVersion &Vrhs) const
-{
-   if (pkgVersionCompare(Value.begin(),Value.end(),
-                    Vrhs.Value.begin(),Vrhs.Value.end()) == -1)
-      return true;
-   return false;
-}
-                                                                       /*}}}*/
 // StrToLong - Convert the string between two iterators to a long      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -212,32 +183,32 @@ bool pkgCheckDep(const char *DepVer,const char *PkgVer,int Op)
    int Res = pkgVersionCompare(PkgVer,DepVer);
    switch (Op & 0x0F)
    {
-      case pkgCache::LessEq:
+      case pkgCache::Dep::LessEq:
       if (Res <= 0)
         return true;
       break;
       
-      case pkgCache::GreaterEq:
+      case pkgCache::Dep::GreaterEq:
       if (Res >= 0)
         return true;
       break;
       
-      case pkgCache::Less:
+      case pkgCache::Dep::Less:
       if (Res < 0)
         return true;
       break;
       
-      case pkgCache::Greater:
+      case pkgCache::Dep::Greater:
       if (Res > 0)
         return true;
       break;
       
-      case pkgCache::Equals:
+      case pkgCache::Dep::Equals:
       if (Res == 0)
         return true;
       break;
       
-      case pkgCache::NotEquals:
+      case pkgCache::Dep::NotEquals:
       if (Res != 0)
         return true;
       break;