[Zope-Checkins] CVS: Zope2 - BTreeTemplate.c:1.13 BucketTemplate.c:1.10 SetOpTemplate.c:1.6 SetTemplate.c:1.10 intkeymacros.h:1.5 intvaluemacros.h:1.6

[Jim Fulton]

Update of /cvs-repository/Zope2/lib/python/BTrees
In directory korak:/tmp/cvs-serv5264

Modified Files:
	BTreeTemplate.c BucketTemplate.c SetOpTemplate.c SetTemplate.c 
	intkeymacros.h intvaluemacros.h 
Log Message:
Rewrote a macro and it's calls to avoid confusing optimizing
compilers.




--- Updated File BTreeTemplate.c in package Zope2 --
--- BTreeTemplate.c	2001/03/20 13:52:00	1.12
+++ BTreeTemplate.c	2001/03/21 14:16:58	1.13
@@ -96,7 +96,7 @@
   PyObject *r;
   KEY_TYPE key;
   
-  COPY_KEY_FROM_ARG(key, keyarg, &copied);
+  COPY_KEY_FROM_ARG(key, keyarg, copied);
   UNLESS (copied) return NULL;
 
   PER_USE_OR_RETURN(self, NULL);
@@ -409,7 +409,7 @@
   BTreeItem *d;
   KEY_TYPE key;
 
-  COPY_KEY_FROM_ARG(key, keyarg, &copied);
+  COPY_KEY_FROM_ARG(key, keyarg, copied);
   UNLESS (copied) return -1;
 
   PER_USE_OR_RETURN(self, -1);
@@ -754,7 +754,7 @@
         {          
           if (i) 
             {
-              COPY_KEY_FROM_ARG(d->key, PyTuple_GET_ITEM(items,l), &copied);
+              COPY_KEY_FROM_ARG(d->key, PyTuple_GET_ITEM(items,l), copied);
               l++;
               UNLESS (&copied) return -1;
               INCREF_KEY(d->key);
@@ -873,7 +873,7 @@
   int min, max, i=0, cmp, copied=1;
   KEY_TYPE key;
 
-  COPY_KEY_FROM_ARG(key, keyarg, &copied);
+  COPY_KEY_FROM_ARG(key, keyarg, copied);
   UNLESS (copied) return -1;
 
   /* We don't need to: PER_USE_OR_RETURN(self, -1);
@@ -1124,7 +1124,7 @@
   PER_USE_OR_RETURN(self, NULL);
 
   UNLESS (PyArg_ParseTuple(args, "O", &omin)) return NULL;
-  COPY_VALUE_FROM_ARG(min, omin, &copied);
+  COPY_VALUE_FROM_ARG(min, omin, copied);
   UNLESS(copied) return NULL;
     
   UNLESS (r=PyList_New(0)) goto err;

--- Updated File BucketTemplate.c in package Zope2 --
--- BucketTemplate.c	2001/03/20 13:52:00	1.9
+++ BucketTemplate.c	2001/03/21 14:16:58	1.10
@@ -102,7 +102,7 @@
   PyObject *r;
   KEY_TYPE key;
   
-  COPY_KEY_FROM_ARG(key, keyarg, &copied);
+  COPY_KEY_FROM_ARG(key, keyarg, copied);
   UNLESS (copied) return NULL;
 
   PER_USE_OR_RETURN(self, NULL);
@@ -194,7 +194,7 @@
   int min, max, i, l, cmp, copied=1;
   KEY_TYPE key;
   
-  COPY_KEY_FROM_ARG(key, keyarg, &copied);
+  COPY_KEY_FROM_ARG(key, keyarg, copied);
   UNLESS(copied) return -1;
 
   PER_USE_OR_RETURN(self, -1);
@@ -210,7 +210,7 @@
                 {
                   VALUE_TYPE value;
 
-                  COPY_VALUE_FROM_ARG(value, v, &copied);
+                  COPY_VALUE_FROM_ARG(value, v, copied);
                   UNLESS(copied) return -1;
 
 #ifdef VALUE_SAME
@@ -295,7 +295,7 @@
 
   UNLESS (noval)
     {
-      COPY_VALUE_FROM_ARG(self->values[i], v, &copied);
+      COPY_VALUE_FROM_ARG(self->values[i], v, copied);
       UNLESS(copied) return -1;
       INCREF_VALUE(self->values[i]);
     }
@@ -487,7 +487,7 @@
   Bucket *release = NULL;
   KEY_TYPE key;
 
-  COPY_KEY_FROM_ARG(key, keyarg, &copied);
+  COPY_KEY_FROM_ARG(key, keyarg, copied);
   UNLESS (copied) return -1;
 
   PER_USE_OR_RETURN(self, -1);
@@ -768,7 +768,7 @@
   PER_USE_OR_RETURN(self, NULL);
 
   UNLESS (PyArg_ParseTuple(args, "O", &omin)) return NULL;
-  COPY_VALUE_FROM_ARG(min, omin, &copied);
+  COPY_VALUE_FROM_ARG(min, omin, copied);
   UNLESS(copied) return NULL;
 
   for (i=0, l=0; i < self->len; i++) 
@@ -994,9 +994,9 @@
       v=PyTuple_GET_ITEM(items, l);
       l++;
 
-      COPY_KEY_FROM_ARG(self->keys[i], k, &copied);
+      COPY_KEY_FROM_ARG(self->keys[i], k, copied);
       UNLESS (copied) return -1;
-      COPY_VALUE_FROM_ARG(self->values[i], v, &copied);
+      COPY_VALUE_FROM_ARG(self->values[i], v, copied);
       UNLESS (copied) return -1;
       INCREF_KEY(self->keys[i]);
       INCREF_VALUE(self->values[i]);

--- Updated File SetOpTemplate.c in package Zope2 --
--- SetOpTemplate.c	2001/03/20 13:52:00	1.5
+++ SetOpTemplate.c	2001/03/21 14:16:58	1.6
@@ -202,7 +202,7 @@
       Py_INCREF(s);
       i->next=nextKeyAsSet;
       i->hasValue=0;
-      COPY_KEY_FROM_ARG(i->key, s, &copied);
+      COPY_KEY_FROM_ARG(i->key, s, copied);
       UNLESS (copied) return -1;
     }
 #endif

--- Updated File SetTemplate.c in package Zope2 --
--- SetTemplate.c	2001/03/20 13:52:00	1.9
+++ SetTemplate.c	2001/03/21 14:16:58	1.10
@@ -179,7 +179,7 @@
   for (i=0; i<l; i++)
     {
       k=PyTuple_GET_ITEM(items, i);
-      COPY_KEY_FROM_ARG(self->keys[i], k, &copied);
+      COPY_KEY_FROM_ARG(self->keys[i], k, copied);
       UNLESS (copied) return -1;
       INCREF_KEY(self->keys[i]);
     }

--- Updated File intkeymacros.h in package Zope2 --
--- intkeymacros.h	2001/03/20 13:52:00	1.4
+++ intkeymacros.h	2001/03/21 14:16:58	1.5
@@ -11,4 +11,4 @@
 #define COPY_KEY_FROM_ARG(TARGET, ARG, STATUS) \
   if (PyInt_Check(ARG)) TARGET=PyInt_AsLong(ARG); else { \
       PyErr_SetString(PyExc_TypeError, "expected integer key"); \
-      *(STATUS)=0; } 
+      (STATUS)=0; } 

--- Updated File intvaluemacros.h in package Zope2 --
--- intvaluemacros.h	2001/03/20 13:52:00	1.5
+++ intvaluemacros.h	2001/03/21 14:16:58	1.6
@@ -13,7 +13,7 @@
 #define COPY_VALUE_FROM_ARG(TARGET, ARG, STATUS) \
   if (PyInt_Check(ARG)) TARGET=PyInt_AsLong(ARG); else { \
       PyErr_SetString(PyExc_TypeError, "expected integer value"); \
-      *(STATUS)=0; } 
+      (STATUS)=0; } 
   
 #define NORMALIZE_VALUE(V, MIN) ((MIN) > 0) ? ((V)/=(MIN)) : 0