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

Daniel Burrows dburrows@costa.debian.org
Sun, 10 Apr 2005 00:53:04 +0000


Author: dburrows
Date: Sun Apr 10 00:53:01 2005
New Revision: 2981

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
Log:
Use public inheritance to not break everything..

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Apr 10 00:53:01 2005
@@ -1,5 +1,9 @@
 2005-04-09  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptitude_resolver.h:
+
+	  Use public inheritance from generic_problem_resolver (d'oh).
+
 	* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
 
 	  Add missing get_version_count(), fill in and fix the constructor

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:53:01 2005
@@ -1002,7 +1002,7 @@
   }
 };
 
-class aptitude_resolver:generic_problem_resolver<aptitude_universe>
+class aptitude_resolver:public generic_problem_resolver<aptitude_universe>
 {
   const aptitude_universe universe;
 public: