diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-01-06 16:14:10 -0500 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-01-06 16:14:10 -0500 |
| commit | 96d9c34a1ac1cb9845422d4533ba396c7a5b62a8 (patch) | |
| tree | 159c820b91095cc4d6127d8f6c814c26dfe1062b | |
| parent | d3e8d697abe3f50fce0a2b81526483ee533d36af (diff) | |
| parent | 3202612006ce651913d2fd448e3eb6393ba8414b (diff) | |
| download | numpy-96d9c34a1ac1cb9845422d4533ba396c7a5b62a8.tar.gz | |
Merge pull request #5309 from rgommers/remove-f2py-deprecation
MAINT: remove NPY_NO_DEPRECATED_API define from f2py.
| -rw-r--r-- | numpy/f2py/rules.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/src/fortranobject.c | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py index b46776777..52679966b 100644 --- a/numpy/f2py/rules.py +++ b/numpy/f2py/rules.py @@ -110,7 +110,6 @@ module_rules={ * Do not edit this file directly unless you know what you are doing!!! */ -#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION #ifdef __cplusplus extern \"C\" { #endif @@ -234,7 +233,6 @@ PyMODINIT_FUNC init#modulename#(void) { #ifdef __cplusplus } #endif -#undef NPY_NO_DEPRECATED_API """, 'separatorsfor':{'latexdoc':'\n\n', 'restdoc':'\n\n'}, diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c index 47a69640b..2e182922d 100644 --- a/numpy/f2py/src/fortranobject.c +++ b/numpy/f2py/src/fortranobject.c @@ -1,5 +1,4 @@ #define FORTRANOBJECT_C -#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION #include "fortranobject.h" #ifdef __cplusplus @@ -1036,6 +1035,4 @@ F2PyCapsule_Check(PyObject *ptr) #ifdef __cplusplus } #endif - -#undef NPY_NO_DEPRECATED_API /************************* EOF fortranobject.c *******************************/ |