diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2012-02-01 18:42:25 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2012-02-04 16:11:39 -0700 |
| commit | 8a0e7cd26ea2803b8580dcca1d1306baa1d702dc (patch) | |
| tree | 47af5fff3afe569556ea1824358296f87efdc327 /numpy/numarray | |
| parent | c4b92ea0a2530c1dfe582d7f5635a0b793286166 (diff) | |
| download | numpy-8a0e7cd26ea2803b8580dcca1d1306baa1d702dc.tar.gz | |
UPDATE: Replace macros in old_defines.h by new.
With the exception of the numarray fixups these were all instances
that were results of code generation.
Diffstat (limited to 'numpy/numarray')
| -rw-r--r-- | numpy/numarray/_capi.c | 4 | ||||
| -rw-r--r-- | numpy/numarray/include/numpy/arraybase.h | 32 |
2 files changed, 18 insertions, 18 deletions
diff --git a/numpy/numarray/_capi.c b/numpy/numarray/_capi.c index deb2cd478..7b866a8be 100644 --- a/numpy/numarray/_capi.c +++ b/numpy/numarray/_capi.c @@ -2828,7 +2828,7 @@ NA_NewAllFromBuffer(int ndim, maybelong *shape, NumarrayType type, if (byteorder != NA_ByteOrder()) { PyArray_Descr *temp; - temp = PyArray_DescrNewByteorder(dtype, PyArray_SWAP); + temp = PyArray_DescrNewByteorder(dtype, NPY_SWAP); Py_DECREF(dtype); if (temp == NULL) return NULL; dtype = temp; @@ -2856,7 +2856,7 @@ NA_NewAllFromBuffer(int ndim, maybelong *shape, NumarrayType type, newdims.len = ndim; newdims.ptr = shape; newself = (PyArrayObject *)\ - PyArray_Newshape(self, &newdims, PyArray_CORDER); + PyArray_Newshape(self, &newdims, NPY_CORDER); Py_DECREF(self); self = newself; } diff --git a/numpy/numarray/include/numpy/arraybase.h b/numpy/numarray/include/numpy/arraybase.h index 32f9948f4..02430b08a 100644 --- a/numpy/numarray/include/numpy/arraybase.h +++ b/numpy/numarray/include/numpy/arraybase.h @@ -20,22 +20,22 @@ typedef npy_float64 Float64; typedef enum { - tAny=-1, - tBool=PyArray_BOOL, - tInt8=PyArray_INT8, - tUInt8=PyArray_UINT8, - tInt16=PyArray_INT16, - tUInt16=PyArray_UINT16, - tInt32=PyArray_INT32, - tUInt32=PyArray_UINT32, - tInt64=PyArray_INT64, - tUInt64=PyArray_UINT64, - tFloat32=PyArray_FLOAT32, - tFloat64=PyArray_FLOAT64, - tComplex32=PyArray_COMPLEX64, - tComplex64=PyArray_COMPLEX128, - tObject=PyArray_OBJECT, /* placeholder... does nothing */ - tMaxType=PyArray_NTYPES, + tAny = -1, + tBool = NPY_BOOL, + tInt8 = NPY_INT8, + tUInt8 = NPY_UINT8, + tInt16 = NPY_INT16, + tUInt16 = NPY_UINT16, + tInt32 = NPY_INT32, + tUInt32 = NPY_UINT32, + tInt64 = NPY_INT64, + tUInt64 = NPY_UINT64, + tFloat32 = NPY_FLOAT32, + tFloat64 = NPY_FLOAT64, + tComplex32 = NPY_COMPLEX64, + tComplex64 = NPY_COMPLEX128, + tObject = NPY_OBJECT, /* placeholder... does nothing */ + tMaxType = NPY_NTYPES, tDefault = tFloat64, #if NPY_BITSOF_LONG == 64 tLong = tInt64, |