diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarraymodule.c | 2 | ||||
| -rw-r--r-- | numpy/core/src/scalartypes.inc.src | 11 | ||||
| -rw-r--r-- | numpy/core/src/umathmodule.c.src | 22 |
3 files changed, 19 insertions, 16 deletions
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index 4f25ef374..53ce89a94 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -2327,7 +2327,7 @@ PyArray_Choose(PyArrayObject *ip, PyObject *op, PyArrayObject *ret, NPY_CLIPMODE clipmode) { int n, elsize; - intp i, m; + intp i; char *ret_data; PyArrayObject **mps, *ap; PyArrayMultiIterObject *multi=NULL; diff --git a/numpy/core/src/scalartypes.inc.src b/numpy/core/src/scalartypes.inc.src index 5ca83e59b..b65f7adbc 100644 --- a/numpy/core/src/scalartypes.inc.src +++ b/numpy/core/src/scalartypes.inc.src @@ -2022,12 +2022,15 @@ object_arrtype_dealloc(PyObject *v) #default=0*16,1*2,2# */ -#define _NPY_UNUSED1 -#define _NPY_UNUSEDz -#define _NPY_UNUSED0 NPY_UNUSED +#define _NPY_UNUSED2_1 +#define _NPY_UNUSED2_z +#define _NPY_UNUSED2_0 NPY_UNUSED +#define _NPY_UNUSED1_0 +#define _NPY_UNUSED1_1 +#define _NPY_UNUSED1_2 NPY_UNUSED static PyObject * -@name@_arrtype_new(PyTypeObject *type, PyObject *args, PyObject *_NPY_UNUSED@work@(kwds)) +@name@_arrtype_new(PyTypeObject *_NPY_UNUSED1_@default@(type), PyObject *args, PyObject *_NPY_UNUSED2_@work@(kwds)) { PyObject *obj = NULL; PyObject *robj; diff --git a/numpy/core/src/umathmodule.c.src b/numpy/core/src/umathmodule.c.src index 881268490..af66c256b 100644 --- a/numpy/core/src/umathmodule.c.src +++ b/numpy/core/src/umathmodule.c.src @@ -56,7 +56,7 @@ Py_square(PyObject *o) } static PyObject * -Py_get_one(PyObject *o) +Py_get_one(PyObject *NPY_UNUSED(o)) { return PyInt_FromLong(1); } @@ -604,7 +604,7 @@ BOOL_@kind@(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(func)) /**end repeat**/ static void -BOOL_ones_like(char **args, intp *dimensions, intp *steps, void *data) +BOOL_ones_like(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data)) { OUTPUT_LOOP { *((Bool *)op) = 1; @@ -633,7 +633,7 @@ BOOL_ones_like(char **args, intp *dimensions, intp *steps, void *data) #define @S@@TYPE@_floor_divide @S@@TYPE@_divide static void -@S@@TYPE@_ones_like(char **args, intp *dimensions, intp *steps, void *data) +@S@@TYPE@_ones_like(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data)) { OUTPUT_LOOP { *((@s@@type@ *)op) = 1; @@ -641,7 +641,7 @@ static void } static void -@S@@TYPE@_square(char **args, intp *dimensions, intp *steps, void *data) +@S@@TYPE@_square(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data)) { UNARY_LOOP { const @s@@type@ in1 = *(@s@@type@ *)ip1; @@ -650,7 +650,7 @@ static void } static void -@S@@TYPE@_reciprocal(char **args, intp *dimensions, intp *steps, void *data) +@S@@TYPE@_reciprocal(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data)) { UNARY_LOOP { const @s@@type@ in1 = *(@s@@type@ *)ip1; @@ -1032,7 +1032,7 @@ static void } static void -@TYPE@_square(char **args, intp *dimensions, intp *steps, void *data) +@TYPE@_square(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data)) { UNARY_LOOP { const @type@ in1 = *(@type@ *)ip1; @@ -1041,7 +1041,7 @@ static void } static void -@TYPE@_reciprocal(char **args, intp *dimensions, intp *steps, void *data) +@TYPE@_reciprocal(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data)) { UNARY_LOOP { const @type@ in1 = *(@type@ *)ip1; @@ -1050,7 +1050,7 @@ static void } static void -@TYPE@_ones_like(char **args, intp *dimensions, intp *steps, void *data) +@TYPE@_ones_like(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data)) { OUTPUT_LOOP { *((@type@ *)op) = 1; @@ -1314,7 +1314,7 @@ static void /**end repeat1**/ static void -@CTYPE@_square(char **args, intp *dimensions, intp *steps, void *data) +@CTYPE@_square(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data)) { UNARY_LOOP { const @type@ in1r = ((@type@ *)ip1)[0]; @@ -1325,7 +1325,7 @@ static void } static void -@CTYPE@_reciprocal(char **args, intp *dimensions, intp *steps, void *data) +@CTYPE@_reciprocal(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data)) { UNARY_LOOP { const @type@ in1r = ((@type@ *)ip1)[0]; @@ -1345,7 +1345,7 @@ static void } static void -@CTYPE@_ones_like(char **args, intp *dimensions, intp *steps, void *data) +@CTYPE@_ones_like(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data)) { OUTPUT_LOOP { ((@type@ *)op)[0] = 1; |