[Zodb-checkins] CVS: Zope/lib/python/BTrees - BTreeTemplate.c:1.26 BucketTemplate.c:1.29

[Toby Dickenson]

Update of /cvs-repository/Zope/lib/python/BTrees
In directory cvs.zope.org:/tmp/cvs-serv10497/lib/python/BTrees

Modified Files:
	BTreeTemplate.c BucketTemplate.c 
Log Message:
merged toby-stiff-cache-branch and toby-unicode-branch

=== Zope/lib/python/BTrees/BTreeTemplate.c 1.25 => 1.26 ===
   if (self->firstbucket)
     {
-      ASSERT(self->firstbucket->ob_refcnt > 1, 
+      ASSERT(self->firstbucket->ob_refcnt > 0, 
              "Invalid firstbucket pointer", -1);
       Py_DECREF(self->firstbucket);
       self->firstbucket=NULL;
@@ -573,7 +573,7 @@
   if (self->state==cPersistent_UPTODATE_STATE && self->jar)
     {
       if (_BTree_clear(self) < 0) return NULL;
-      self->state=cPersistent_GHOST_STATE;
+      PER_GHOSTIFY(self);
     }
 
   Py_INCREF(Py_None);


=== Zope/lib/python/BTrees/BucketTemplate.c 1.28 => 1.29 ===
     {
       if (_bucket_clear(self) < 0) return NULL;
-      self->state=cPersistent_GHOST_STATE;
+      PER_GHOSTIFY(self);
     }
 
   Py_INCREF(Py_None);