[Aptitude-devel] r2982 - in branches/aptitude-0.3/aptitude: . src/generic src/generic/problemresolver

[Daniel Burrows]

Author: dburrows
Date: Sun Apr 10 00:57:30 2005
New Revision: 2982

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Fix various missing/broken bits o' glue.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Apr 10 00:57:30 2005
@@ -1,5 +1,10 @@
 2005-04-09  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h:
+
+	  Fix various errors in the code that cropped up while trying to
+	  assemble everything.
+
 	* src/generic/aptitude_resolver.h:
 
 	  Use public inheritance from generic_problem_resolver (d'oh).

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	Sun Apr 10 00:57:30 2005
@@ -602,6 +602,8 @@
       finished=true;
 
     normalize();
+
+    return *this;
   }
 
   aptitude_resolver_version operator*() const
@@ -996,6 +998,11 @@
     return (*apt_cache_file)->PkgBegin();
   }
 
+  broken_dep_iterator broken_begin() const
+  {
+    return (*apt_cache_file)->PkgBegin();
+  }
+
   unsigned long get_version_count() const
   {
     return (*apt_cache_file)->Head().VersionCount;
@@ -1042,4 +1049,17 @@
 		  int non_default_score);
 };
 
+std::ostream &operator<<(ostream &out, aptitude_resolver_dep d)
+{
+  out << d.get_source().get_name()
+      << " {";
+
+  for(aptitude_resolver_dep::solver_iterator i=d.solvers_begin(); !i.end(); ++i)
+    out << (*i).get_package().get_name() << " "
+	<< (*i).get_name();
+  out << "}";
+
+  return out;
+}
+
 #endif

Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h	Sun Apr 10 00:57:30 2005
@@ -738,7 +738,7 @@
 	  {
 	    std::cout << "Dropping closed solution ";
 	    s.dump(std::cout);
-	    std::cout << endl;
+	    std::cout << std::endl;
 	    continue;
 	  }
 
@@ -810,7 +810,7 @@
       for(typename PackageUniverse::package::version_iterator v=(*p).versions_begin();
 	  !v.end(); ++v)
 	out << (*v).get_name() << " ";
-      out << ">" << " " << (*p).current_version().get_name() << endl;
+      out << ">" << " " << (*p).current_version().get_name() << std::endl;
     }
 
   for(typename PackageUniverse::dep_iterator d=world.deps_begin();
@@ -826,9 +826,9 @@
 	{
 	  out << " " << (*t).get_package().get_name() << " " << (*t).get_name() << " ";
 	}
-      out << " > " << endl;
+      out << " > " << std::endl;
     }
-  out << "]" << endl;
+  out << "]" << std::endl;
 }
 
 #endif