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

[Daniel Burrows]

Author: dburrows
Date: Fri Apr 29 14:16:26 2005
New Revision: 3186

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Fix the subset-inclusion test.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Apr 29 14:16:26 2005
@@ -1,5 +1,9 @@
 2005-04-29  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/problemresolver/problemresolver.h:
+
+	  Right, test subset-inclusion in the correct order...
+
 	* src/ui.cc:
 
 	  Fix some typos in various strings that were pointed out by the

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	Fri Apr 29 14:16:26 2005
@@ -581,8 +581,8 @@
     // the number of potential solutions.
     for(typename std::vector<solution>::const_iterator i=generated_solutions.begin();
 	i!=generated_solutions.end(); ++i)
-      if(includes(i->get_actions().begin(), i->get_actions().end(),
-		  s.get_actions().begin(), s.get_actions().end()))
+      if(includes(s.get_actions().begin(), s.get_actions().end(),
+		  i->get_actions().begin(), i->get_actions().end()))
 	return true;
 
     return false;