[Scipy-svn] r4179 - trunk/scipy/cluster/src

[scipy-svn at scipy.org]

Author: damian.eads
Date: 2008-04-25 22:08:04 -0500 (Fri, 25 Apr 2008)
New Revision: 4179

Modified:
   trunk/scipy/cluster/src/hierarchy.c
   trunk/scipy/cluster/src/hierarchy_wrap.c
Log:
Got rid of gcc34 warnings.

Modified: trunk/scipy/cluster/src/hierarchy.c
===================================================================
--- trunk/scipy/cluster/src/hierarchy.c	2008-04-25 18:48:01 UTC (rev 4178)
+++ trunk/scipy/cluster/src/hierarchy.c	2008-04-26 03:08:04 UTC (rev 4179)
@@ -293,7 +293,7 @@
 
 double jaccard_distance_bool(const char *u, const char *v, int n) {
   int i = 0;
-  double s = 0.0, num = 0.0, denom = 0.0;
+  double num = 0.0, denom = 0.0;
   for (i = 0; i < n; i++) {
     num += (u[i] != v[i]) && ((u[i] != 0) || (v[i] != 0));
     denom += (u[i] != 0) || (v[i] != 0);

Modified: trunk/scipy/cluster/src/hierarchy_wrap.c
===================================================================
--- trunk/scipy/cluster/src/hierarchy_wrap.c	2008-04-25 18:48:01 UTC (rev 4178)
+++ trunk/scipy/cluster/src/hierarchy_wrap.c	2008-04-26 03:08:04 UTC (rev 4179)
@@ -248,7 +248,6 @@
 
 extern PyObject *cluster_maxclust_monocrit_wrap(PyObject *self, PyObject *args) {
   int n, mc;
-  double cutoff;
   PyArrayObject *Z, *MC, *T;
   if (!PyArg_ParseTuple(args, "O!O!O!ii",
 			&PyArray_Type, &Z,
@@ -903,8 +902,7 @@
   {NULL, NULL}     /* Sentinel - marks the end of this structure */
 };
 
-void init_hierarchy_wrap()  {
+void init_hierarchy_wrap(void)  {
   (void) Py_InitModule("_hierarchy_wrap", _hierarchyWrapMethods);
   import_array();  // Must be present for NumPy.  Called first after above line.
 }
-