[Numpy-svn] r3842 - trunk/numpy/core/include/numpy

numpy-svn at scipy.org numpy-svn at scipy.org
Tue May 29 16:43:42 EDT 2007


Author: oliphant
Date: 2007-05-29 15:43:37 -0500 (Tue, 29 May 2007)
New Revision: 3842

Modified:
   trunk/numpy/core/include/numpy/ndarrayobject.h
Log:
Make changeset 3830 in the right place.

Modified: trunk/numpy/core/include/numpy/ndarrayobject.h
===================================================================
--- trunk/numpy/core/include/numpy/ndarrayobject.h	2007-05-29 10:36:27 UTC (rev 3841)
+++ trunk/numpy/core/include/numpy/ndarrayobject.h	2007-05-29 20:43:37 UTC (rev 3842)
@@ -1923,23 +1923,23 @@
    inline the constants inside a for loop making it a moot point
 */
 
-#define PyArray_GETPTR1(obj, i) (void *)(PyArray_BYTES(obj) +                 \
-                                         (i)*PyArray_STRIDES(obj)[0])
+#define PyArray_GETPTR1(obj, i) ((void *)(PyArray_BYTES(obj) +                \
+                                         (i)*PyArray_STRIDES(obj)[0]))
 
-#define PyArray_GETPTR2(obj, i, j) (void *)(PyArray_BYTES(obj) +              \
+#define PyArray_GETPTR2(obj, i, j) ((void *)(PyArray_BYTES(obj) +             \
                                             (i)*PyArray_STRIDES(obj)[0] +     \
-                                            (j)*PyArray_STRIDES(obj)[1])
+                                            (j)*PyArray_STRIDES(obj)[1]))
 
-#define PyArray_GETPTR3(obj, i, j, k) (void *)(PyArray_BYTES(obj) +           \
+#define PyArray_GETPTR3(obj, i, j, k) ((void *)(PyArray_BYTES(obj) +          \
                                             (i)*PyArray_STRIDES(obj)[0] +     \
                                             (j)*PyArray_STRIDES(obj)[1] +     \
-                                            (k)*PyArray_STRIDES(obj)[2])      \
+                                            (k)*PyArray_STRIDES(obj)[2])) 
 
-#define PyArray_GETPTR4(obj, i, j, k, l) (void *)(PyArray_BYTES(obj) +        \
+#define PyArray_GETPTR4(obj, i, j, k, l) ((void *)(PyArray_BYTES(obj) +       \
                                             (i)*PyArray_STRIDES(obj)[0] +     \
                                             (j)*PyArray_STRIDES(obj)[1] +     \
                                             (k)*PyArray_STRIDES(obj)[2] +     \
-                                            (l)*PyArray_STRIDES(obj)[3])
+                                            (l)*PyArray_STRIDES(obj)[3]))
 
 #define PyArray_XDECREF_ERR(obj) \
         if (obj && (PyArray_FLAGS(obj) & NPY_UPDATEIFCOPY)) {                 \




More information about the Numpy-svn mailing list