[Aptitude-svn-commit] r4081 - in branches/aptitude-0.3/aptitude: . src/generic/problemresolver

[Daniel Burrows]

Author: dburrows
Date: Wed Sep 14 16:39:17 2005
New Revision: 4081

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Add a missing std::

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Sep 14 16:39:17 2005
@@ -1,5 +1,10 @@
 2005-09-14  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/problemresolver/problemresolver.h:
+
+	  includes is in namespace std, add a qualifier (why did this ever
+	  compile?).
+
 	* src/generic/problemresolver/Makefile.am:
 
 	  Ugh: link threads.o and util.o into test.  In the future I need

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	Wed Sep 14 16:39:17 2005
@@ -1399,8 +1399,8 @@
      // the number of potential solutions.
      for(typename std::vector<solution>::const_iterator i=generated_solutions.begin();
 	 i!=generated_solutions.end(); ++i)
-       if(includes(s.get_actions().begin(), s.get_actions().end(),
-		   i->get_actions().begin(), i->get_actions().end()))
+       if(std::includes(s.get_actions().begin(), s.get_actions().end(),
+			i->get_actions().begin(), i->get_actions().end()))
 	 return true;
 
      if(s.get_score() < minimum_score)