Commit f9d7e2c6 authored by Jim Fulton's avatar Jim Fulton

Fixed C inheritence problem. Waaaaaaa.

parent f2b7f146
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
static char BTree_module_documentation[] = static char BTree_module_documentation[] =
"" ""
"\n$Id: BTree.c,v 1.14 1998/02/05 17:46:17 jim Exp $" "\n$Id: BTree.c,v 1.15 1998/02/18 22:19:50 jim Exp $"
; ;
#define PERSISTENT #define PERSISTENT
...@@ -1746,7 +1746,7 @@ initBTree() ...@@ -1746,7 +1746,7 @@ initBTree()
#endif #endif
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.14 $"; char *rev="$Revision: 1.15 $";
UNLESS(PyExtensionClassCAPI=PyCObject_Import("ExtensionClass","CAPI")) UNLESS(PyExtensionClassCAPI=PyCObject_Import("ExtensionClass","CAPI"))
return; return;
...@@ -1754,21 +1754,13 @@ initBTree() ...@@ -1754,21 +1754,13 @@ initBTree()
#ifdef PERSISTENT #ifdef PERSISTENT
if(cPersistenceCAPI=PyCObject_Import("cPersistence","CAPI")) if(cPersistenceCAPI=PyCObject_Import("cPersistence","CAPI"))
{ {
static PyMethodChain mb, mn; BucketType.methods.link=cPersistenceCAPI->methods;
mb.methods=BucketType.methods.methods;
BucketType.methods.methods=cPersistenceCAPI->methods->methods;
BucketType.methods.link=&mb;
BucketType.tp_getattro=cPersistenceCAPI->getattro; BucketType.tp_getattro=cPersistenceCAPI->getattro;
BucketType.tp_setattro=cPersistenceCAPI->setattro; BucketType.tp_setattro=cPersistenceCAPI->setattro;
BTreeType.methods.link=cPersistenceCAPI->methods;
mn.methods=BTreeType.methods.methods;
BTreeType.methods.methods=cPersistenceCAPI->methods->methods;
BTreeType.methods.link=&mn;
BTreeType.tp_getattro=cPersistenceCAPI->getattro; BTreeType.tp_getattro=cPersistenceCAPI->getattro;
BTreeType.tp_setattro=cPersistenceCAPI->setattro; BTreeType.tp_setattro=cPersistenceCAPI->setattro;
} }
else return; else return;
#else #else
...@@ -1808,6 +1800,9 @@ initBTree() ...@@ -1808,6 +1800,9 @@ initBTree()
Revision Log: Revision Log:
$Log: BTree.c,v $ $Log: BTree.c,v $
Revision 1.15 1998/02/18 22:19:50 jim
Fixed C inheritence problem. Waaaaaaa.
Revision 1.14 1998/02/05 17:46:17 jim Revision 1.14 1998/02/05 17:46:17 jim
Added get methods. Added get methods.
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
static char intSet_module_documentation[] = static char intSet_module_documentation[] =
"" ""
"\n$Id: intSet.c,v 1.6 1997/12/12 23:48:07 jim Exp $" "\n$Id: intSet.c,v 1.7 1998/02/18 22:19:39 jim Exp $"
; ;
#include <limits.h> #include <limits.h>
...@@ -528,16 +528,13 @@ void ...@@ -528,16 +528,13 @@ void
initintSet() initintSet()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.6 $"; char *rev="$Revision: 1.7 $";
UNLESS(ExtensionClassImported) return; UNLESS(ExtensionClassImported) return;
if(cPersistenceCAPI=PyCObject_Import("cPersistence","CAPI")) if(cPersistenceCAPI=PyCObject_Import("cPersistence","CAPI"))
{ {
static PyMethodChain m; intSetType.methods.link=cPersistenceCAPI->methods;
m.methods=intSetType.methods.methods;
intSetType.methods.methods=cPersistenceCAPI->methods->methods;
intSetType.methods.link=&m;
intSetType.tp_getattro=cPersistenceCAPI->getattro; intSetType.tp_getattro=cPersistenceCAPI->getattro;
intSetType.tp_setattro=cPersistenceCAPI->setattro; intSetType.tp_setattro=cPersistenceCAPI->setattro;
} }
...@@ -569,6 +566,9 @@ initintSet() ...@@ -569,6 +566,9 @@ initintSet()
Revision Log: Revision Log:
$Log: intSet.c,v $ $Log: intSet.c,v $
Revision 1.7 1998/02/18 22:19:39 jim
Fixed C inheritence problem. Waaaaaaa.
Revision 1.6 1997/12/12 23:48:07 jim Revision 1.6 1997/12/12 23:48:07 jim
Added basicnew support. Added basicnew support.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment