diff options
author | Chris Kerr <debdepba@dasganma.tk> | 2014-11-10 15:24:26 +0000 |
---|---|---|
committer | Chris Kerr <debdepba@dasganma.tk> | 2014-11-10 16:01:52 +0000 |
commit | 64d4fa5d963708ed592bc911feb2e874bcf0672f (patch) | |
tree | 5d4e3e8483f862448c28189d736b3a53152fc289 /numpy/f2py/src/fortranobject.c | |
parent | fd12653823a406d368eba0c381f192efda7d59d4 (diff) | |
download | numpy-64d4fa5d963708ed592bc911feb2e874bcf0672f.tar.gz |
DEP: Using the internal PyArrayObject_fields API for the swap_arrays and dump_attrs functions
Diffstat (limited to 'numpy/f2py/src/fortranobject.c')
-rw-r--r-- | numpy/f2py/src/fortranobject.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c index 0dfd5df96..cd15f3bec 100644 --- a/numpy/f2py/src/fortranobject.c +++ b/numpy/f2py/src/fortranobject.c @@ -616,7 +616,8 @@ void dump_dims(int rank, npy_intp* dims) { } printf("]\n"); } -void dump_attrs(const PyArrayObject* arr) { +void dump_attrs(const PyArrayObject* obj) { + const PyArrayObject_fields *arr = (const PyArrayObject_fields*) obj; int rank = PyArray_NDIM(arr); npy_intp size = PyArray_Size((PyObject *)arr); printf("\trank = %d, flags = %d, size = %" NPY_INTP_FMT "\n", @@ -630,7 +631,9 @@ void dump_attrs(const PyArrayObject* arr) { #define SWAPTYPE(a,b,t) {t c; c = (a); (a) = (b); (b) = c; } -static int swap_arrays(PyArrayObject* arr1, PyArrayObject* arr2) { +static int swap_arrays(PyArrayObject* obj1, PyArrayObject* obj2) { + PyArrayObject_fields *arr1 = (PyArrayObject_fields*) obj1, + *arr2 = (PyArrayObject_fields*) obj2; SWAPTYPE(arr1->data,arr2->data,char*); SWAPTYPE(arr1->nd,arr2->nd,int); SWAPTYPE(arr1->dimensions,arr2->dimensions,npy_intp*); |