[Zope-Checkins] CVS: Zope/lib/Components/BTree - BTree.c:1.32 intSet.c:1.23

[Toby Dickenson]

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

Modified Files:
	BTree.c intSet.c 
Log Message:
merged toby-stiff-cache-branch and toby-unicode-branch

=== Zope/lib/Components/BTree/BTree.c 1.31 => 1.32 ===
       if(HasInstDict(self) && (dict=INSTANCE_DICT(self))) PyDict_Clear(dict);
       self->len=0;
-      self->state=cPersistent_GHOST_STATE;
+      PER_GHOSTIFY(self);
     }
 
   Py_INCREF(Py_None);
@@ -1163,7 +1163,7 @@
 
       if(_BTree_clear(self) < 0) return NULL;
       if(HasInstDict(self) && (dict=INSTANCE_DICT(self))) PyDict_Clear(dict);
-      self->state=cPersistent_GHOST_STATE;
+      PER_GHOSTIFY(self);
     }
 
   Py_INCREF(Py_None);


=== Zope/lib/Components/BTree/intSet.c 1.22 => 1.23 ===
     {
       PyDict_Clear(dict);
-      self->state=cPersistent_GHOST_STATE;
+      PER_GHOSTIFY(self);
     }
 
   Py_INCREF(Py_None);