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

[Daniel Burrows]

Author: dburrows
Date: Fri Apr 29 16:04:49 2005
New Revision: 3187

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
Log:
Add debugging asserts.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Apr 29 16:04:49 2005
@@ -1,5 +1,9 @@
 2005-04-29  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptitude_resolver.h:
+
+	  Add some asserts to cache situations that shouldn't happen.
+
 	* src/generic/problemresolver/problemresolver.h:
 
 	  Right, test subset-inclusion in the correct order...

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	Fri Apr 29 16:04:49 2005
@@ -63,6 +63,8 @@
 			    pkgDepCache *_cache)
     :cache(_cache), pkg(_pkg)
   {
+    assert(cache!=0);
+    assert(pkg.Cache()!=0);
   }
 
   unsigned int get_id() const
@@ -119,6 +121,9 @@
 			    pkgDepCache *_cache)
     :cache(_cache), pkg(_pkg), ver(_ver)
   {
+    assert(cache!=0);
+    assert(pkg.Cache()!=0);
+    assert(ver.Cache()!=0);
   }
 
   pkgCache::PkgIterator get_pkg() const
@@ -221,6 +226,9 @@
 			pkgDepCache *_cache)
     :cache(_cache), prv(_prv)
   {
+    assert(cache!=0);
+    assert(const_cast<pkgCache::DepIterator &>(dep).Cache()!=0);
+    assert(prv.Cache()!=0);
     assert(!dep.end());
     if(dep->Type != pkgCache::Dep::Conflicts)
       {