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

[Daniel Burrows]

Author: dburrows
Date: Thu Aug 25 00:32:51 2005
New Revision: 3946

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.h
   branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc
Log:
Move operator<< out of the resolver code.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 25 00:32:51 2005
@@ -1,5 +1,11 @@
 2005-08-24  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h, src/generic/aptitude_resolver_universe.cc, src/generic/aptitude_resolver_universe.h, tests/test_apt_universe.cc:
+
+	  Move the operator<< for aptitude_universe_dep objects to
+	  aptitude_resolver_universe, so stuff that just uses the universe
+	  (e.g., the test code) can avoid including the whole resolver.
+
 	* tests/Makefile.am, tests/test_apt_universe.cc:
 
 	  Add tests for the graph-structure of the apt universe

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc	Thu Aug 25 00:32:51 2005
@@ -152,22 +152,3 @@
 	add_version_score(*vi, score_tweak);
       }
 }
-
-std::ostream &operator<<(ostream &out, aptitude_resolver_dep d)
-{
-  out << d.get_source().get_package().get_name()
-      << " "
-      << d.get_source().get_name()
-      << " -> {";
-
-  for(aptitude_resolver_dep::solver_iterator i=d.solvers_begin(); !i.end(); ++i)
-    {
-      if(i!=d.solvers_begin())
-	out << " ";
-      out << (*i).get_package().get_name() << " "
-	  << (*i).get_name();
-    }
-  out << "}";
-
-  return out;
-}

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h	Thu Aug 25 00:32:51 2005
@@ -104,6 +104,4 @@
 			   int optional, int extra);
 };
 
-std::ostream &operator<<(ostream &out, aptitude_resolver_dep d);
-
 #endif

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	Thu Aug 25 00:32:51 2005
@@ -539,3 +539,22 @@
   normalize();
   return *this;
 }
+
+std::ostream &operator<<(ostream &out, aptitude_resolver_dep d)
+{
+  out << d.get_source().get_package().get_name()
+      << " "
+      << d.get_source().get_name()
+      << " -> {";
+
+  for(aptitude_resolver_dep::solver_iterator i=d.solvers_begin(); !i.end(); ++i)
+    {
+      if(i!=d.solvers_begin())
+	out << " ";
+      out << (*i).get_package().get_name() << " "
+	  << (*i).get_name();
+    }
+  out << "}";
+
+  return out;
+}

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	Thu Aug 25 00:32:51 2005
@@ -882,4 +882,6 @@
   }
 };
 
+std::ostream &operator<<(ostream &out, aptitude_resolver_dep d);
+
 #endif

Modified: branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc	Thu Aug 25 00:32:51 2005
@@ -19,9 +19,7 @@
 //
 // A test of the aptitude universe wrapper.
 
-#include <src/generic/aptitude_resolver.h>
 #include <src/generic/aptitude_resolver_universe.h>
-#include <src/generic/problemresolver/problemresolver.h>
 
 #include <cppunit/extensions/HelperMacros.h>