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

[Daniel Burrows]

Author: dburrows
Date: Sun Apr 10 01:05:55 2005
New Revision: 2985

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
Log:
Fix some multiply-defined functions.  It compiles and even links now (fancy that).

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Apr 10 01:05:55 2005
@@ -1,5 +1,10 @@
 2005-04-09  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
+
+	  Fix some multiply-defined functions by making them inline and/or
+	  moving them to the .cc file.
+
 	* src/cmdline/cmdline_do_action.cc:
 
 	  On dist-upgrade, etc, run the new resolver.  Its output is

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	Sun Apr 10 01:05:55 2005
@@ -81,3 +81,16 @@
 	}
     }
 }
+
+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;
+}

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 01:05:55 2005
@@ -177,7 +177,7 @@
   revdep_iterator revdeps_begin() const;
 };
 
-aptitude_resolver_version aptitude_resolver_package::current_version() const
+inline aptitude_resolver_version aptitude_resolver_package::current_version() const
 {
   return aptitude_resolver_version(pkg, (*apt_cache_file)[pkg].InstVerIter(*apt_cache_file));
 }
@@ -1053,17 +1053,6 @@
 		  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;
-}
+std::ostream &operator<<(ostream &out, aptitude_resolver_dep d);
 
 #endif