summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2017-01-20 19:49:26 +0100
committerPauli Virtanen <pav@iki.fi>2017-01-20 19:49:26 +0100
commitcd28173172c2f20ded46d921534e7e5245eeabc3 (patch)
treea4b6ccb82bf14e13e22d9b61303075578b3d6473
parent6014614cc37c9688a7cbbc5de66f333e16f3d341 (diff)
downloadnumpy-cd28173172c2f20ded46d921534e7e5245eeabc3.tar.gz
MAINT: core: fix compiler warnings
-rw-r--r--numpy/core/src/private/lowlevel_strided_loops.h2
-rw-r--r--numpy/core/src/umath/ufunc_object.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/numpy/core/src/private/lowlevel_strided_loops.h b/numpy/core/src/private/lowlevel_strided_loops.h
index 707e661e4..8a1312c35 100644
--- a/numpy/core/src/private/lowlevel_strided_loops.h
+++ b/numpy/core/src/private/lowlevel_strided_loops.h
@@ -696,7 +696,7 @@ npy_bswap8_unaligned(char * x)
PyArray_STRIDE(arr, 0) : \
PyArray_ITEMSIZE(arr)))
-static int
+static NPY_INLINE int
PyArray_EQUIVALENTLY_ITERABLE_OVERLAP_OK(PyArrayObject *arr1, PyArrayObject *arr2,
int arr1_read, int arr2_read)
{
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c
index 8de0537cc..dd399cafd 100644
--- a/numpy/core/src/umath/ufunc_object.c
+++ b/numpy/core/src/umath/ufunc_object.c
@@ -1712,7 +1712,6 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc,
npy_intp *strides;
npy_intp *countptr;
- PyArrayObject **op_it;
npy_uint32 iter_flags;
if (wheremask != NULL) {
@@ -1787,7 +1786,6 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc,
needs_api = NpyIter_IterationNeedsAPI(iter);
/* Call the __array_prepare__ functions where necessary */
- op_it = NpyIter_GetOperandArray(iter);
for (i = nin; i < nop; ++i) {
PyArrayObject *op_tmp;