diff options
author | Chris Kerr <debdepba@dasganma.tk> | 2014-11-10 14:45:15 +0000 |
---|---|---|
committer | Chris Kerr <debdepba@dasganma.tk> | 2014-11-10 14:45:15 +0000 |
commit | c5f0d72a9059d44511be158031d0c8e77f1f9b6b (patch) | |
tree | f9897f97910d1788ae47423e79e2f6a24dde5ef1 /numpy/f2py/cfuncs.py | |
parent | 2129f5c5c0f52d4e428f406e1cbd7ce62bca4af8 (diff) | |
download | numpy-c5f0d72a9059d44511be158031d0c8e77f1f9b6b.tar.gz |
DEP: replaced arr->dimensions with PyArray_DIMS(arr) or PyArray_DIM(arr,i)
Diffstat (limited to 'numpy/f2py/cfuncs.py')
-rw-r--r-- | numpy/f2py/cfuncs.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py index 393878734..15db0ffc0 100644 --- a/numpy/f2py/cfuncs.py +++ b/numpy/f2py/cfuncs.py @@ -249,7 +249,7 @@ cppmacros['len..']="""\ #define rank(var) var ## _Rank #define shape(var,dim) var ## _Dims[dim] #define old_rank(var) (PyArray_NDIM((PyArrayObject *)(capi_ ## var ## _tmp))) -#define old_shape(var,dim) (((PyArrayObject *)(capi_ ## var ## _tmp))->dimensions[dim]) +#define old_shape(var,dim) PyArray_DIM(((PyArrayObject *)(capi_ ## var ## _tmp)),dim) #define fshape(var,dim) shape(var,rank(var)-dim-1) #define len(var) shape(var,0) #define flen(var) fshape(var,0) @@ -537,14 +537,14 @@ cfuncs['calcarrindex']="""\ static int calcarrindex(int *i,PyArrayObject *arr) { \tint k,ii = i[0]; \tfor (k=1; k < PyArray_NDIM(arr); k++) -\t\tii += (ii*(arr->dimensions[k] - 1)+i[k]); /* assuming contiguous arr */ +\t\tii += (ii*(PyArray_DIM(arr,k) - 1)+i[k]); /* assuming contiguous arr */ \treturn ii; }""" cfuncs['calcarrindextr']="""\ static int calcarrindextr(int *i,PyArrayObject *arr) { \tint k,ii = i[PyArray_NDIM(arr)-1]; \tfor (k=1; k < PyArray_NDIM(arr); k++) -\t\tii += (ii*(arr->dimensions[PyArray_NDIM(arr)-k-1] - 1)+i[PyArray_NDIM(arr)-k-1]); /* assuming contiguous arr */ +\t\tii += (ii*(PyArray_DIM(arr,PyArray_NDIM(arr)-k-1) - 1)+i[PyArray_NDIM(arr)-k-1]); /* assuming contiguous arr */ \treturn ii; }""" cfuncs['forcomb']="""\ |