[Numpy-svn] r5940 - trunk/numpy/core/src

[numpy-svn at scipy.org]

Author: cdavid
Date: 2008-10-08 08:36:29 -0500 (Wed, 08 Oct 2008)
New Revision: 5940

Modified:
   trunk/numpy/core/src/multiarraymodule.c
   trunk/numpy/core/src/scalartypes.inc.src
   trunk/numpy/core/src/umathmodule.c.src
Log:
More unused warning handled.


Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2008-10-08 13:35:27 UTC (rev 5939)
+++ trunk/numpy/core/src/multiarraymodule.c	2008-10-08 13:36:29 UTC (rev 5940)
@@ -2327,7 +2327,7 @@
                NPY_CLIPMODE clipmode)
 {
     int n, elsize;
-    intp i, m;
+    intp i;
     char *ret_data;
     PyArrayObject **mps, *ap;
     PyArrayMultiIterObject *multi=NULL;

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2008-10-08 13:35:27 UTC (rev 5939)
+++ trunk/numpy/core/src/scalartypes.inc.src	2008-10-08 13:36:29 UTC (rev 5940)
@@ -2022,12 +2022,15 @@
 #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 *
- at name@_arrtype_new(PyTypeObject *type, PyObject *args, PyObject *_NPY_UNUSED at work@(kwds))
+ at name@_arrtype_new(PyTypeObject *_NPY_UNUSED1_ at default@(type), PyObject *args, PyObject *_NPY_UNUSED2_ at work@(kwds))
 {
     PyObject *obj = NULL;
     PyObject *robj;

Modified: trunk/numpy/core/src/umathmodule.c.src
===================================================================
--- trunk/numpy/core/src/umathmodule.c.src	2008-10-08 13:35:27 UTC (rev 5939)
+++ trunk/numpy/core/src/umathmodule.c.src	2008-10-08 13:36:29 UTC (rev 5940)
@@ -56,7 +56,7 @@
 }
 
 static PyObject *
-Py_get_one(PyObject *o)
+Py_get_one(PyObject *NPY_UNUSED(o))
 {
     return PyInt_FromLong(1);
 }
@@ -604,7 +604,7 @@
 /**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 @@
 #define @S@@TYPE at _floor_divide @S@@TYPE at _divide
 
 static void
- at S@@TYPE at _ones_like(char **args, intp *dimensions, intp *steps, void *data)
+ at S@@TYPE at _ones_like(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data))
 {
     OUTPUT_LOOP {
         *((@s@@type@ *)op) = 1;
@@ -641,7 +641,7 @@
 }
 
 static void
- at S@@TYPE at _square(char **args, intp *dimensions, intp *steps, void *data)
+ at S@@TYPE at _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
- at S@@TYPE at _reciprocal(char **args, intp *dimensions, intp *steps, void *data)
+ at S@@TYPE at _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
- at TYPE@_square(char **args, intp *dimensions, intp *steps, void *data)
+ at 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
- at TYPE@_reciprocal(char **args, intp *dimensions, intp *steps, void *data)
+ at 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
- at TYPE@_ones_like(char **args, intp *dimensions, intp *steps, void *data)
+ at TYPE@_ones_like(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data))
 {
     OUTPUT_LOOP {
         *((@type@ *)op) = 1;
@@ -1314,7 +1314,7 @@
 /**end repeat1**/
 
 static void
- at CTYPE@_square(char **args, intp *dimensions, intp *steps, void *data)
+ at 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
- at CTYPE@_reciprocal(char **args, intp *dimensions, intp *steps, void *data)
+ at 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
- at CTYPE@_ones_like(char **args, intp *dimensions, intp *steps, void *data)
+ at CTYPE@_ones_like(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(data))
 {
     OUTPUT_LOOP {
         ((@type@ *)op)[0] = 1;