diff options
| author | Han Genuit <hangenuit@gmail.com> | 2012-09-03 23:43:14 +0200 |
|---|---|---|
| committer | Sebastian Berg <sebastian@sipsolutions.net> | 2013-04-11 16:57:06 +0200 |
| commit | 62dc28a2691d28e0a5dffea6ab285aee7bf1e3bf (patch) | |
| tree | 584586aa1fc22d3c5d7407b1d39ace0da9984531 /numpy | |
| parent | 8a836c53d85f63831e51e7aac9a2f77fdf25ef9f (diff) | |
| download | numpy-62dc28a2691d28e0a5dffea6ab285aee7bf1e3bf.tar.gz | |
BUG: Multiple fixes from merging.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/mapping.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c index 7dc17f7c4..ea0aeb709 100644 --- a/numpy/core/src/multiarray/mapping.c +++ b/numpy/core/src/multiarray/mapping.c @@ -109,7 +109,7 @@ array_item_asarray(PyArrayObject *self, npy_intp i) /* Get array item at given index */ NPY_NO_EXPORT PyObject * -array_item(PyArrayObject *self, Py_ssize_t i) +array_item(PyArrayObject *self, Py_ssize_t _i) { /* Workaround Python 2.4: Py_ssize_t not the same as npyint_p */ npy_intp i = _i; @@ -982,13 +982,13 @@ static npy_bool _check_ellipses(PyObject *op) { if ((op == Py_Ellipsis) || PyString_Check(op) || PyUnicode_Check(op)) { - return TRUE; + return NPY_TRUE; } else if (PyBool_Check(op) || PyArray_IsScalar(op, Bool) || (PyArray_Check(op) && (PyArray_DIMS((PyArrayObject *)op)==0) && PyArray_ISBOOL((PyArrayObject *)op))) { - return TRUE; + return NPY_TRUE; } else if (PySequence_Check(op)) { Py_ssize_t n, i; @@ -1000,13 +1000,13 @@ _check_ellipses(PyObject *op) temp = PySequence_GetItem(op, i); if (temp == Py_Ellipsis) { Py_DECREF(temp); - return TRUE; + return NPY_TRUE; } Py_DECREF(temp); i++; } } - return FALSE; + return NPY_FALSE; } NPY_NO_EXPORT PyObject * |