[Aptitude-svn-commit] r4015 - in branches/aptitude-0.3/aptitude: . src src/generic

[Daniel Burrows]

Author: dburrows
Date: Wed Aug 31 17:46:52 2005
New Revision: 4015

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/apt.h
   branches/aptitude-0.3/aptitude/src/solution_fragment.cc
Log:
Lift pkg_name_lt and ver_name_lt to generic code.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Aug 31 17:46:52 2005
@@ -1,5 +1,9 @@
 2005-08-31  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/util.cc, src/generic/util.h, src/solution_fragment.cc:
+
+	  Lift pkg_name_lt and ver_name_lt to generic code.
+
 	* src/solution_fragment.cc:
 
 	  Sort elements of a solution by name.

Modified: branches/aptitude-0.3/aptitude/src/generic/apt.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt.h	Wed Aug 31 17:46:52 2005
@@ -187,4 +187,26 @@
 bool is_interesting_dep(const pkgCache::DepIterator &d,
 			pkgDepCache *cache);
 
+/** Sort packages by name. */
+struct pkg_name_lt
+{
+public:
+  bool operator()(const pkgCache::PkgIterator &p1,
+		  const pkgCache::PkgIterator &p2) const
+  {
+    return strcmp(p1.Name(), p2.Name()) < 0;
+  }
+};
+
+/** Sort versions by package name. */
+struct ver_name_lt
+{
+public:
+  bool operator()(const pkgCache::VerIterator &v1,
+		  const pkgCache::VerIterator &v2) const
+  {
+    return strcmp(v1.ParentPkg().Name(), v2.ParentPkg().Name()) < 0;
+  }
+};
+
 #endif

Modified: branches/aptitude-0.3/aptitude/src/solution_fragment.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_fragment.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_fragment.cc	Wed Aug 31 17:46:52 2005
@@ -35,26 +35,6 @@
 
 using namespace std;
 
-struct pkg_name_lt
-{
-public:
-  bool operator()(const pkgCache::PkgIterator &p1,
-		  const pkgCache::PkgIterator &p2) const
-  {
-    return strcmp(p1.Name(), p2.Name()) < 0;
-  }
-};
-
-struct ver_name_lt
-{
-public:
-  bool operator()(const pkgCache::VerIterator &v1,
-		  const pkgCache::VerIterator &v2) const
-  {
-    return strcmp(v1.ParentPkg().Name(), v2.ParentPkg().Name()) < 0;
-  }
-};
-
 string archives_text(const pkgCache::VerIterator &ver)
 {
   string rval;