Changeset 1613

Timestamp:

Oct 18, 2010 10:55:32 AM (9 years ago)

Author:

lou

Message:

Small changes (remove local static variables) to allow DLL build with Visual Studio

Location:

trunk/Clp/src

Files:

• ClpNode.cpp (modified) (3 diffs)
• ClpSimplex.cpp (modified) (2 diffs)

trunk/Clp/src/ClpNode.cpp

@@ -1160 +1160 @@
 }
 
-int
-ClpHashValue::hash ( double value) const
-{
-     static int mmult[] = {
+namespace {
+  /*
+    Originally a local static variable in ClpHashValue::hash.
+        Local static variables are a problem when building DLLs on Windows, but
+        file-local constants seem to be ok.  -- lh, 101016 --
+  */
+  const int mmult_for_hash[] = {
           262139, 259459, 256889, 254291, 251701, 249133, 246709, 244247,
           241667, 239179, 236609, 233983, 231289, 228859, 226357, 223829,
@@ -1175 +1178 @@
           82183, 79939, 77587, 75307, 72959, 70793, 68447, 66103
      };
+}
+int
+ClpHashValue::hash ( double value) const
+{
+     
      union {
           double d;
@@ -1186 +1194 @@
      for ( j = 0; j < 8; ++j ) {
           int ichar = v1.c[j];
-          n += mmult[j] * ichar;
+          n += mmult_for_hash[j] * ichar;
      }
      return ( abs ( n ) % maxHash_ );   /* integer abs */

trunk/Clp/src/ClpSimplex.cpp

@@ -1695 +1695 @@
      //}
      //}
+#    ifndef _MSC_VER
+         // The local static var k is a problem when trying to build a DLL. Since this is
+         // just for debugging (likely done on *nix), just hide it from Windows
+         // -- lh, 101016 --
      if (0)  {
           static int k = 0;
@@ -1708 +1712 @@
           k++;
      }
+#    endif
      int status = factorization_->factorize(this, solveType, valuesPass);
      if (status) {