diff options
| author | Lars Buitinck <larsmans@gmail.com> | 2013-10-15 18:24:36 +0200 |
|---|---|---|
| committer | Lars Buitinck <larsmans@gmail.com> | 2013-10-19 18:35:18 +0200 |
| commit | 31d6c4ea5882e1335b3f89e022e7df71380c07ac (patch) | |
| tree | 91692151132ca1a60978149505dc7b1bfa9752c2 /numpy/core | |
| parent | 002de555e86ec02fe4ebf3765fe0f4a7e72a7db5 (diff) | |
| download | numpy-31d6c4ea5882e1335b3f89e022e7df71380c07ac.tar.gz | |
MAINT: unused variable, formatting
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/src/multiarray/nditer_api.c | 3 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/number.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/numpy/core/src/multiarray/nditer_api.c b/numpy/core/src/multiarray/nditer_api.c index 164a3a7a3..905a19d55 100644 --- a/numpy/core/src/multiarray/nditer_api.c +++ b/numpy/core/src/multiarray/nditer_api.c @@ -1832,8 +1832,7 @@ npyiter_copy_from_buffers(NpyIter *iter) *reduce_outeraxisdata = NULL; PyArray_Descr **dtypes = NIT_DTYPES(iter); - npy_intp transfersize = NBF_SIZE(bufferdata), - buffersize = NBF_BUFFERSIZE(bufferdata); + npy_intp transfersize = NBF_SIZE(bufferdata); npy_intp *strides = NBF_STRIDES(bufferdata), *ad_strides = NAD_STRIDES(axisdata); npy_intp sizeof_axisdata = NIT_AXISDATA_SIZEOF(itflags, ndim, nop); diff --git a/numpy/core/src/multiarray/number.c b/numpy/core/src/multiarray/number.c index db62bd5fd..c1d04c536 100644 --- a/numpy/core/src/multiarray/number.c +++ b/numpy/core/src/multiarray/number.c @@ -221,8 +221,10 @@ PyArray_GenericBinaryFunction(PyArrayObject *m1, PyObject *m2, PyObject *op) * - https://github.com/numpy/numpy/issues/3502 * - https://github.com/numpy/numpy/issues/3503 */ - double m1_prio = PyArray_GetPriority(m1, NPY_SCALAR_PRIORITY); - double m2_prio = PyArray_GetPriority(m2, NPY_SCALAR_PRIORITY); + double m1_prio = PyArray_GetPriority((PyObject *)m1, + NPY_SCALAR_PRIORITY); + double m2_prio = PyArray_GetPriority((PyObject *)m2, + NPY_SCALAR_PRIORITY); if (m1_prio < m2_prio) { Py_INCREF(Py_NotImplemented); return Py_NotImplemented; |