[Zodb-checkins] CVS: Zope3/src/zodb/btrees - BTreeModuleTemplate.c:1.5 SetOpTemplate.c:1.4 _IIBTree.c:1.3 _IOBTree.c:1.3

[Tim Peters]

Update of /cvs-repository/Zope3/src/zodb/btrees
In directory cvs.zope.org:/tmp/cvs-serv2371/src/zodb/btrees

Modified Files:
	BTreeModuleTemplate.c SetOpTemplate.c _IIBTree.c _IOBTree.c 
Log Message:
Removed all references to intSet.h, EXCLUDE_INTSET_SUPPORT, and
INTSET_H.  That stuff doesn't exist in Zope3.


=== Zope3/src/zodb/btrees/BTreeModuleTemplate.c 1.4 => 1.5 ===
--- Zope3/src/zodb/btrees/BTreeModuleTemplate.c:1.4	Fri Feb 21 22:40:22 2003
+++ Zope3/src/zodb/btrees/BTreeModuleTemplate.c	Mon Mar 31 11:37:04 2003
@@ -441,12 +441,6 @@
 	ConflictError=PyExc_ValueError;
     }
 
-#ifdef INTSET_H
-    UNLESS(d = PyImport_ImportModule("intSet")) return;
-    UNLESS(intSetType = PyObject_GetAttrString (d, "intSet")) return;
-    Py_DECREF (d);
-#endif
-
     /* Initialize the PyPersist_C_API and the type objects. */
     PyPersist_C_API = PyCObject_Import("persistence._persistence", "C_API");
     if (PyPersist_C_API == NULL)


=== Zope3/src/zodb/btrees/SetOpTemplate.c 1.3 => 1.4 ===
--- Zope3/src/zodb/btrees/SetOpTemplate.c:1.3	Fri Feb 21 12:33:01 2003
+++ Zope3/src/zodb/btrees/SetOpTemplate.c	Mon Mar 31 11:37:04 2003
@@ -18,33 +18,6 @@
 
 #define SETOPTEMPLATE_C "$Id$\n"
 
-#ifdef INTSET_H
-static int
-nextIntSet(SetIteration *i)
-{
-  if (i->position >= 0)
-    {
-      UNLESS(PER_USE(INTSET(i->set))) return -1;
-
-      if (i->position < INTSET(i->set)->len)
-        {
-          i->key = INTSET(i->set)->data[i->position];
-          i->position ++;
-        }
-      else
-        {
-          i->position = -1;
-          PyPersist_SetATime(INTSET(i->set));
-        }
-
-      PER_ALLOW_DEACTIVATION(INTSET(i->set));
-    }
-
-
-  return 0;
-}
-#endif
-
 #ifdef KEY_CHECK
 static int
 nextKeyAsSet(SetIteration *i)
@@ -141,14 +114,6 @@
       UNLESS(i->set) return -1;
       i->next = nextTreeSetItems;
     }
-#ifdef INTSET_H
-  else if (s->ob_type == (PyTypeObject*)intSetType)
-    {
-      i->set = s;
-      Py_INCREF(s);
-      i->next = nextIntSet;
-    }
-#endif
 #ifdef KEY_CHECK
   else if (KEY_CHECK(s))
     {


=== Zope3/src/zodb/btrees/_IIBTree.c 1.2 => 1.3 ===
--- Zope3/src/zodb/btrees/_IIBTree.c:1.2	Wed Dec 25 09:12:16 2002
+++ Zope3/src/zodb/btrees/_IIBTree.c	Mon Mar 31 11:37:04 2003
@@ -11,7 +11,4 @@
 
 #include "intkeymacros.h"
 #include "intvaluemacros.h"
-#ifndef EXCLUDE_INTSET_SUPPORT
-#include "BTree/intSet.h"
-#endif
 #include "BTreeModuleTemplate.c"


=== Zope3/src/zodb/btrees/_IOBTree.c 1.2 => 1.3 ===
--- Zope3/src/zodb/btrees/_IOBTree.c:1.2	Wed Dec 25 09:12:16 2002
+++ Zope3/src/zodb/btrees/_IOBTree.c	Mon Mar 31 11:37:04 2003
@@ -10,7 +10,4 @@
                                 
 #include "intkeymacros.h"
 #include "objectvaluemacros.h"
-#ifndef EXCLUDE_INTSET_SUPPORT
-#include "BTree/intSet.h"
-#endif
 #include "BTreeModuleTemplate.c"