[Zodb-checkins] CVS: ZODB3/BTrees - BTreeModuleTemplate.c:1.37.92.1 BTreeTemplate.c:1.74.10.1 BucketTemplate.c:1.54.6.1 SetTemplate.c:1.16.52.1 TreeSetTemplate.c:1.15.52.1

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/BTrees
In directory cvs.zope.org:/tmp/cvs-serv29339/BTrees

Modified Files:
      Tag: zodb33-devel-branch
	BTreeModuleTemplate.c BTreeTemplate.c BucketTemplate.c 
	SetTemplate.c TreeSetTemplate.c 
Log Message:
Track module moves from ZODB to Persistence.

Add a few quick hacks to the BTrees code to get them to compile.


=== ZODB3/BTrees/BTreeModuleTemplate.c 1.37 => 1.37.92.1 ===
--- ZODB3/BTrees/BTreeModuleTemplate.c:1.37	Tue Jun 25 18:02:27 2002
+++ ZODB3/BTrees/BTreeModuleTemplate.c	Tue Jul  1 15:34:08 2003
@@ -14,6 +14,7 @@
 
 #ifdef PERSISTENT
 #include "cPersistence.h"
+#include "ExtensionClass.h"
 
 /***************************************************************
    The following are macros that ought to be in cPersistence.h */
@@ -399,21 +400,17 @@
       return;
 
 #ifdef PERSISTENT
-  if ((cPersistenceCAPI=PyCObject_Import("cPersistence","CAPI")))
+  if ((cPersistenceCAPI=PyCObject_Import("Persistence.cPersistence","CAPI")))
     {
-	BucketType.methods.link=cPersistenceCAPI->methods;
 	BucketType.tp_getattro=cPersistenceCAPI->getattro;
 	BucketType.tp_setattro=cPersistenceCAPI->setattro;
 
-	SetType.methods.link=cPersistenceCAPI->methods;
 	SetType.tp_getattro=cPersistenceCAPI->getattro;
 	SetType.tp_setattro=cPersistenceCAPI->setattro;
 
-	BTreeType.methods.link=cPersistenceCAPI->methods;
 	BTreeType.tp_getattro=cPersistenceCAPI->getattro;
 	BTreeType.tp_setattro=cPersistenceCAPI->setattro;
 
-	TreeSetType.methods.link=cPersistenceCAPI->methods;
 	TreeSetType.tp_getattro=cPersistenceCAPI->getattro;
 	TreeSetType.tp_setattro=cPersistenceCAPI->setattro;
     }


=== ZODB3/BTrees/BTreeTemplate.c 1.74 => 1.74.10.1 ===
--- ZODB3/BTrees/BTreeTemplate.c:1.74	Fri Apr 11 12:09:58 2003
+++ ZODB3/BTrees/BTreeTemplate.c	Tue Jul  1 15:34:08 2003
@@ -1759,8 +1759,5 @@
   "Mapping type implemented as sorted list of items",
   METHOD_CHAIN(BTree_methods),
   EXTENSIONCLASS_BASICNEW_FLAG
-#ifdef PERSISTENT
-  | PERSISTENT_TYPE_FLAG
-#endif
   | EXTENSIONCLASS_NOINSTDICT_FLAG,
 };


=== ZODB3/BTrees/BucketTemplate.c 1.54 => 1.54.6.1 ===
--- ZODB3/BTrees/BucketTemplate.c:1.54	Sun May 11 20:36:17 2003
+++ ZODB3/BTrees/BucketTemplate.c	Tue Jul  1 15:34:08 2003
@@ -1437,9 +1437,6 @@
   "Mapping type implemented as sorted list of items",
   METHOD_CHAIN(Bucket_methods),
   EXTENSIONCLASS_BASICNEW_FLAG
-#ifdef PERSISTENT
-  | PERSISTENT_TYPE_FLAG
-#endif
   | EXTENSIONCLASS_NOINSTDICT_FLAG,
 };
 


=== ZODB3/BTrees/SetTemplate.c 1.16 => 1.16.52.1 ===
--- ZODB3/BTrees/SetTemplate.c:1.16	Fri Oct  4 20:39:57 2002
+++ ZODB3/BTrees/SetTemplate.c	Tue Jul  1 15:34:08 2003
@@ -263,9 +263,6 @@
   "Set implemented as sorted keys", 
   METHOD_CHAIN(Set_methods),
   EXTENSIONCLASS_BASICNEW_FLAG 
-#ifdef PERSISTENT
-  | PERSISTENT_TYPE_FLAG 
-#endif
   | EXTENSIONCLASS_NOINSTDICT_FLAG,
 };
 


=== ZODB3/BTrees/TreeSetTemplate.c 1.15 => 1.15.52.1 ===
--- ZODB3/BTrees/TreeSetTemplate.c:1.15	Fri Oct  4 20:39:57 2002
+++ ZODB3/BTrees/TreeSetTemplate.c	Tue Jul  1 15:34:08 2003
@@ -156,8 +156,5 @@
   "Set implemented as sorted tree of items",
   METHOD_CHAIN(TreeSet_methods),
   EXTENSIONCLASS_BASICNEW_FLAG
-#ifdef PERSISTENT
-  | PERSISTENT_TYPE_FLAG
-#endif
   | EXTENSIONCLASS_NOINSTDICT_FLAG,
 };