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

Daniel Burrows dburrows at costa.debian.org
Tue Aug 16 19:35:07 UTC 2005


Author: dburrows
Date: Tue Aug 16 19:35:03 2005
New Revision: 3869

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.h
Log:
Also hide is_interesting_dep, and make it a static member of aptitude_universe.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Aug 16 19:35:03 2005
@@ -1,6 +1,11 @@
 2005-08-16  Daniel Burrows  <dburrows at debian.org>
 
-	* src/generic/Makefile.am, src/generic/aptitude_resolver_universe.cc:
+	* src/generic/aptitude_resolver_universe.cc, src/generic/aptitude_resolver_universe.h:
+
+	  Make the is_interesting_dep function really be a static member
+	  of aptitude_universe, and move it into the .cc file.
+
+	* src/generic/Makefile.am, src/generic/aptitude_resolver_universe.cc, src/generic/aptitude_resolver_universe.h:
 
 	  Move most of the implementation of the resolver universe into a
 	  .cc file.

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc	Tue Aug 16 19:35:03 2005
@@ -6,6 +6,14 @@
 
 using namespace std;
 
+// This should be a static member of the universe object, but it's
+// rather awkward to put it there right now.
+inline bool aptitude_universe::is_interesting_dep(const pkgCache::DepIterator &d)
+{
+  return const_cast<pkgCache::DepIterator &>(d).IsCritical() ||
+    d->Type == pkgCache::Dep::Recommends;
+}
+
 string aptitude_resolver_version::get_name() const
 {
   if(!ver.end())
@@ -48,7 +56,7 @@
 
 bool aptitude_resolver_version::revdep_iterator::applicable() const
 {
-  if(!aptitude_universe_is_interesting_dep(dep_lst))
+  if(!aptitude_universe::is_interesting_dep(dep_lst))
     return false;
 
   // Unversioned deps always apply.
@@ -66,7 +74,7 @@
 void aptitude_resolver_version::revdep_iterator::normalize()
 {
   while(!dep_lst.end() &&
-	(!aptitude_universe_is_interesting_dep(dep_lst) || !applicable()))
+	(!aptitude_universe::is_interesting_dep(dep_lst) || !applicable()))
     ++dep_lst;
 
   if(dep_lst.end() && !provides_open)
@@ -77,7 +85,7 @@
 	{
 	  dep_lst=prv_lst.ParentPkg().RevDependsList();
 	  while(!dep_lst.end() &&
-		(!aptitude_universe_is_interesting_dep(dep_lst) || !applicable()))
+		(!aptitude_universe::is_interesting_dep(dep_lst) || !applicable()))
 	    ++dep_lst;
 	}
       provides_open=true;
@@ -95,7 +103,7 @@
 	  dep_lst=prv_lst.ParentPkg().RevDependsList();
 
 	  while(!dep_lst.end() &&
-		(!aptitude_universe_is_interesting_dep(dep_lst) || !applicable()))
+		(!aptitude_universe::is_interesting_dep(dep_lst) || !applicable()))
 	    ++dep_lst;
 	}
     }
@@ -128,7 +136,7 @@
   // dependency.
   while(!dep.end() &&
 	(dep.ParentPkg() == dep.TargetPkg() ||
-	 !aptitude_universe_is_interesting_dep(dep)))
+	 !aptitude_universe::is_interesting_dep(dep)))
     ++dep;
 
   // If we ran out of deps, we're done!
@@ -373,7 +381,7 @@
 void aptitude_universe::broken_dep_iterator::normalize()
 {
   while(!the_dep.end() &&
-	!(aptitude_universe_is_interesting_dep(the_dep) &&
+	!(aptitude_universe::is_interesting_dep(the_dep) &&
 	  dep_is_inst_broken(the_dep)))
     ++the_dep;
 
@@ -395,7 +403,7 @@
 	    the_dep=ver.DependsList();
 
 	  while(!the_dep.end() &&
-		!(aptitude_universe_is_interesting_dep(the_dep) &&
+		!(aptitude_universe::is_interesting_dep(the_dep) &&
 		  dep_is_inst_broken(the_dep)))
 	    ++the_dep;
 
@@ -404,7 +412,7 @@
 	}
     }
 
-  assert(the_dep.end() || aptitude_universe_is_interesting_dep(the_dep));
+  assert(the_dep.end() || aptitude_universe::is_interesting_dep(the_dep));
 
   // Now dep is a broken critical dep or an end dep.  If it is a
   // conflicts, we might need to push down into Provides...

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.h	Tue Aug 16 19:35:03 2005
@@ -29,14 +29,6 @@
 
 class aptitude_resolver_version;
 
-// This should be a static member of the universe object, but it's
-// rather awkward to put it there right now.
-inline bool aptitude_universe_is_interesting_dep(const pkgCache::DepIterator &d)
-{
-  return const_cast<pkgCache::DepIterator &>(d).IsCritical() ||
-    d->Type == pkgCache::Dep::Recommends;
-}
-
 /** Wraps a PkgIterator for the resolver. */
 class aptitude_resolver_package
 {
@@ -885,6 +877,8 @@
     // PackageCount is added to make room for the UNINST versions.
     return cache->Head().VersionCount+cache->Head().PackageCount;
   }
+
+  static bool is_interesting_dep(const pkgCache::DepIterator &d);
 };
 
 #endif



More information about the Aptitude-svn-commit mailing list