diff options
| author | Chris Kerr <debdepba@dasganma.tk> | 2014-11-10 15:49:14 +0000 |
|---|---|---|
| committer | Chris Kerr <debdepba@dasganma.tk> | 2014-11-10 16:02:48 +0000 |
| commit | 7b607316a8044f5dbb3be054826ab9bd295b66d1 (patch) | |
| tree | 0fe940af4b641cada9f4419bfb23bd852d7482f8 /numpy/f2py | |
| parent | 5f321b415010ec74a978bb4bb495c46dd5af0b09 (diff) | |
| download | numpy-7b607316a8044f5dbb3be054826ab9bd295b66d1.tar.gz | |
DEP: Replace NPY_CONTIGUOUS with NPY_ARRAY_C_CONTIGUOUS
Diffstat (limited to 'numpy/f2py')
| -rw-r--r-- | numpy/f2py/cfuncs.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/src/fortranobject.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py index 329c08bcd..01e189dc1 100644 --- a/numpy/f2py/cfuncs.py +++ b/numpy/f2py/cfuncs.py @@ -223,7 +223,7 @@ cppmacros['SWAP']="""\ \ta = b;\\ \tb = c;} """ -#cppmacros['ISCONTIGUOUS']='#define ISCONTIGUOUS(m) (PyArray_FLAGS(m) & NPY_CONTIGUOUS)' +#cppmacros['ISCONTIGUOUS']='#define ISCONTIGUOUS(m) (PyArray_FLAGS(m) & NPY_ARRAY_C_CONTIGUOUS)' cppmacros['PRINTPYOBJERR']="""\ #define PRINTPYOBJERR(obj)\\ \tfprintf(stderr,\"#modulename#.error is related to \");\\ diff --git a/numpy/f2py/src/fortranobject.h b/numpy/f2py/src/fortranobject.h index 18a26528d..c9b54e259 100644 --- a/numpy/f2py/src/fortranobject.h +++ b/numpy/f2py/src/fortranobject.h @@ -119,7 +119,7 @@ int F2PyCapsule_Check(PyObject *ptr); #endif -#define ISCONTIGUOUS(m) (PyArray_FLAGS(m) & NPY_CONTIGUOUS) +#define ISCONTIGUOUS(m) (PyArray_FLAGS(m) & NPY_ARRAY_C_CONTIGUOUS) #define F2PY_INTENT_IN 1 #define F2PY_INTENT_INOUT 2 #define F2PY_INTENT_OUT 4 |