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

[Daniel Burrows]

Author: dburrows
Date: Sun Apr 10 01:00:29 2005
New Revision: 2983

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:
More of the same.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Apr 10 01:00:29 2005
@@ -2,6 +2,10 @@
 
 	* src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h:
 
+	  Further fixes for constness, typing problems.
+
+	* src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h:
+
 	  Fix various errors in the code that cropped up while trying to
 	  assemble everything.
 

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:00:29 2005
@@ -101,6 +101,10 @@
   pkgCache::PkgIterator pkg;
   pkgCache::VerIterator ver;
 public:
+  aptitude_resolver_version()
+  {
+  }
+
   aptitude_resolver_version(const pkgCache::PkgIterator &_pkg,
 			    const pkgCache::VerIterator &_ver)
     :pkg(_pkg), ver(_ver)
@@ -170,7 +174,7 @@
 
   class revdep_iterator;
 
-  revdep_iterator revdeps_begin();
+  revdep_iterator revdeps_begin() const;
 };
 
 aptitude_resolver_version aptitude_resolver_package::current_version() const
@@ -234,11 +238,11 @@
       return false;
   }
 
-  aptitude_resolver_version get_source()
+  aptitude_resolver_version get_source() const
   {
     assert(!start.end());
-    assert(!start.ParentPkg().end());
-    return aptitude_resolver_version(start.ParentPkg(), start.ParentVer());
+    assert(!const_cast<pkgCache::DepIterator &>(start).ParentPkg().end());
+    return aptitude_resolver_version(const_cast<pkgCache::DepIterator &>(start).ParentPkg(), const_cast<pkgCache::DepIterator &>(start).ParentVer());
   }
 
   class solver_iterator;
@@ -402,7 +406,7 @@
   }
 };
 
-inline aptitude_resolver_version::revdep_iterator aptitude_resolver_version::revdeps_begin()
+inline aptitude_resolver_version::revdep_iterator aptitude_resolver_version::revdeps_begin() const
 {
   return revdep_iterator(ver);
 }

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 01:00:29 2005
@@ -584,7 +584,7 @@
       {
 	std::cout << "Enqueuing ";
 	s2.dump(std::cout);
-	std::cout << endl;
+	std::cout << std::endl;
 
 	open.push(s2);
       }
@@ -592,7 +592,7 @@
       {
 	std::cout << "Dropping closed solution ";
 	s2.dump(std::cout);
-	std::cout << endl;
+	std::cout << std::endl;
       }
   }