BUG: fix compilation on solaris with gcc.

CS is a reserved keyword on Solaris - thanks to John Hunter.
scipy · Sep 26, 2009 · 6250277 · 6250277
1 parent ca02f87
commit 6250277
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/scipy/cluster/src/hierarchy.c b/scipy/cluster/src/hierarchy.c
@@ -1069,7 +1069,7 @@ void inconsistency_calculation_alt(const double *Z, double *R, int n, int d) {
   free(rvisited);
 }
 
-void calculate_cluster_sizes(const double *Z, double *CS, int n) {
+void calculate_cluster_sizes(const double *Z, double *cs, int n) {
   int i, j, k, q;
   const double *row;
   for (k = 0; k < n - 1; k++) {
@@ -1079,22 +1079,22 @@ void calculate_cluster_sizes(const double *Z, double *CS, int n) {
     /** If the left node is a non-singleton, add its count. */
     if (i >= n) {
       q = i - n;
-      CS[k] += CS[q];
+      cs[k] += cs[q];
     }
     /** Otherwise just add 1 for the leaf. */
     else {
-      CS[k] += 1.0;
+      cs[k] += 1.0;
     }
     /** If the right node is a non-singleton, add its count. */
     if (j >= n) {
       q = j - n;
-      CS[k] += CS[q];
+      cs[k] += cs[q];
     }
     /** Otherwise just add 1 for the leaf. */
     else {
-      CS[k] += 1.0;
+      cs[k] += 1.0;
     }
-    CPY_DEBUG_MSG("i=%d, j=%d, CS[%d]=%d\n", i, j, k, (int)CS[k]);
+    CPY_DEBUG_MSG("i=%d, j=%d, cs[%d]=%d\n", i, j, k, (int)cs[k]);
   }
 }
 

diff --git a/scipy/cluster/src/hierarchy.h b/scipy/cluster/src/hierarchy.h
@@ -107,7 +107,7 @@ void linkage_alt(double *dm, double *Z, double *X, int m, int n, int ml, int kc,
 
 void cophenetic_distances(const double *Z, double *d, int n);
 void cpy_to_tree(const double *Z, cnode **tnodes, int n);
-void calculate_cluster_sizes(const double *Z, double *CS, int n);
+void calculate_cluster_sizes(const double *Z, double *cs, int n);
 
 void form_member_list(const double *Z, int *members, int n);
 void form_flat_clusters_from_in(const double *Z, const double *R, int *T,

diff --git a/scipy/cluster/src/hierarchy_wrap.c b/scipy/cluster/src/hierarchy_wrap.c
@@ -114,14 +114,14 @@ extern PyObject *linkage_euclid_wrap(PyObject *self, PyObject *args) {
 
 extern PyObject *calculate_cluster_sizes_wrap(PyObject *self, PyObject *args) {
   int n;
-  PyArrayObject *Z, *CS_;
+  PyArrayObject *Z, *cs_;
   if (!PyArg_ParseTuple(args, "O!O!i",
 			&PyArray_Type, &Z,
-			&PyArray_Type, &CS_,
+			&PyArray_Type, &cs_,
 			&n)) {
     return 0;
   }
-  calculate_cluster_sizes((const double*)Z->data, (double*)CS_->data, n);
+  calculate_cluster_sizes((const double*)Z->data, (double*)cs_->data, n);
   return Py_BuildValue("");
 }