diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2012-01-28 12:18:36 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2012-02-04 16:11:38 -0700 |
| commit | 215a91a9a0e790273a3dc1203709190025ce0641 (patch) | |
| tree | 5eb06f85a8e789cf7776194e13cae8c597d639a2 /numpy/core/src/scalarmathmodule.c.src | |
| parent | 48d6edb89112bf00eaaa55f4b7d284b68a9ab84f (diff) | |
| download | numpy-215a91a9a0e790273a3dc1203709190025ce0641.tar.gz | |
STY: core/src - replace macros in old_defines.h with new versions.
Diffstat (limited to 'numpy/core/src/scalarmathmodule.c.src')
| -rw-r--r-- | numpy/core/src/scalarmathmodule.c.src | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/numpy/core/src/scalarmathmodule.c.src b/numpy/core/src/scalarmathmodule.c.src index 6f18b043a..113d39fa0 100644 --- a/numpy/core/src/scalarmathmodule.c.src +++ b/numpy/core/src/scalarmathmodule.c.src @@ -610,8 +610,8 @@ _@name@_convert_to_ctype(PyObject *a, npy_@name@ *arg1) return -1; } } - else if (PyArray_GetPriority(a, PyArray_SUBTYPE_PRIORITY) > - PyArray_SUBTYPE_PRIORITY) { + else if (PyArray_GetPriority(a, NPY_PRIORITY) > + NPY_PRIORITY) { return -2; } else if ((temp = PyArray_ScalarFromObject(a)) != NULL) { @@ -1360,7 +1360,7 @@ get_functions(void) i = 0; j = 0; - while(signatures[i] != PyArray_FLOAT) {i+=3; j++;} + while(signatures[i] != NPY_FLOAT) {i+=3; j++;} _basic_half_pow = funcdata[j-1]; _basic_float_pow = funcdata[j]; _basic_double_pow = funcdata[j+1]; @@ -1377,7 +1377,7 @@ get_functions(void) signatures = ((PyUFuncObject *)obj)->types; i = 0; j = 0; - while(signatures[i] != PyArray_FLOAT) {i+=2; j++;} + while(signatures[i] != NPY_FLOAT) {i+=2; j++;} _basic_half_floor = funcdata[j-1]; _basic_float_floor = funcdata[j]; _basic_double_floor = funcdata[j+1]; @@ -1391,7 +1391,7 @@ get_functions(void) signatures = ((PyUFuncObject *)obj)->types; i = 0; j = 0; - while(signatures[i] != PyArray_FLOAT) {i+=2; j++;} + while(signatures[i] != NPY_FLOAT) {i+=2; j++;} _basic_half_sqrt = funcdata[j-1]; _basic_float_sqrt = funcdata[j]; _basic_double_sqrt = funcdata[j+1]; @@ -1405,7 +1405,7 @@ get_functions(void) signatures = ((PyUFuncObject *)obj)->types; i = 0; j = 0; - while(signatures[i] != PyArray_FLOAT) {i+=3; j++;} + while(signatures[i] != NPY_FLOAT) {i+=3; j++;} _basic_half_fmod = funcdata[j-1]; _basic_float_fmod = funcdata[j]; _basic_double_fmod = funcdata[j+1]; |