[Numpy-svn] r5974 - trunk/numpy/core/src

numpy-svn@scip... numpy-svn@scip...
Wed Nov 5 10:59:11 CST 2008


Author: charris
Date: 2008-11-05 10:59:07 -0600 (Wed, 05 Nov 2008)
New Revision: 5974

Modified:
   trunk/numpy/core/src/umathmodule.c.src
Log:
Finish replacing op by op1 so it compiles.

Modified: trunk/numpy/core/src/umathmodule.c.src
===================================================================
--- trunk/numpy/core/src/umathmodule.c.src	2008-11-05 16:58:53 UTC (rev 5973)
+++ trunk/numpy/core/src/umathmodule.c.src	2008-11-05 16:59:07 UTC (rev 5974)
@@ -1118,7 +1118,7 @@
 {
     UNARY_LOOP_TWO_OUT {
         const @type@ in1 = *(@type@ *)ip1;
-        *(@type@ *)op1 = modf@c@(in1, (@type@ *)op2);
+        *((@type@ *)op1) = modf@c@(in1, (@type@ *)op2);
     }
 }
 
@@ -1128,7 +1128,7 @@
 {
     UNARY_LOOP_TWO_OUT {
         const @type@ in1 = *(@type@ *)ip1;
-        *(@type@ *)op1 = frexp@c@(in1, (int *)op2);
+        *((@type@ *)op1) = frexp@c@(in1, (int *)op2);
     }
 }
 #endif
@@ -1140,7 +1140,7 @@
     BINARY_LOOP {
         const @type@ in1 = *(@type@ *)ip1;
         const int in2 = *(int *)ip2;
-        *(@type@ *)op = ldexp@c@(in1, in2);
+        *((@type@ *)op1) = ldexp@c@(in1, in2);
     }
 }
 #endif
@@ -1452,7 +1452,7 @@
     BINARY_LOOP {
         PyObject *in1 = *(PyObject **)ip1;
         PyObject *in2 = *(PyObject **)ip2;
-        *(Bool *)op = (Bool) PyObject_RichCompareBool(in1, in2, Py_@OP@);
+        *((Bool *)op1) = (Bool) PyObject_RichCompareBool(in1, in2, Py_@OP@);
     }
 }
 /**end repeat**/
@@ -1463,7 +1463,7 @@
     PyObject *zero = PyInt_FromLong(0);
     UNARY_LOOP {
         PyObject *in1 = *(PyObject **)ip1;
-        *(PyObject **)op = PyInt_FromLong(PyObject_Compare(in1, zero));
+        *((PyObject **)op1) = PyInt_FromLong(PyObject_Compare(in1, zero));
     }
     Py_DECREF(zero);
 }



More information about the Numpy-svn mailing list