diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2012-02-01 18:42:25 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2012-02-04 16:11:39 -0700 |
| commit | 8a0e7cd26ea2803b8580dcca1d1306baa1d702dc (patch) | |
| tree | 47af5fff3afe569556ea1824358296f87efdc327 /numpy/core/src/scalarmathmodule.c.src | |
| parent | c4b92ea0a2530c1dfe582d7f5635a0b793286166 (diff) | |
| download | numpy-8a0e7cd26ea2803b8580dcca1d1306baa1d702dc.tar.gz | |
UPDATE: Replace macros in old_defines.h by new.
With the exception of the numarray fixups these were all instances
that were results of code generation.
Diffstat (limited to 'numpy/core/src/scalarmathmodule.c.src')
| -rw-r--r-- | numpy/core/src/scalarmathmodule.c.src | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/scalarmathmodule.c.src b/numpy/core/src/scalarmathmodule.c.src index 113d39fa0..24f5ebfe8 100644 --- a/numpy/core/src/scalarmathmodule.c.src +++ b/numpy/core/src/scalarmathmodule.c.src @@ -600,8 +600,8 @@ _@name@_convert_to_ctype(PyObject *a, npy_@name@ *arg1) return -1; } descr1 = PyArray_DescrFromTypeObject((PyObject *)Py_TYPE(a)); - if (PyArray_CanCastSafely(descr1->type_num, PyArray_@NAME@)) { - PyArray_CastScalarDirect(a, descr1, arg1, PyArray_@NAME@); + if (PyArray_CanCastSafely(descr1->type_num, NPY_@NAME@)) { + PyArray_CastScalarDirect(a, descr1, arg1, NPY_@NAME@); Py_DECREF(descr1); return 0; } |