Changeset 1549 for trunk/Cbc/test

Timestamp:

Dec 8, 2010 2:28:52 PM (9 years ago)

Author:

lou

Message:

Make Visual Studio v9 build work again.

File:

• trunk/Cbc/test/osiUnitTest.cpp (modified) (2 diffs)

trunk/Cbc/test/osiUnitTest.cpp

@@ -60 +60 @@
   Set default values for data directories.
 */
-  const char dirsep =  CoinFindDirSeparator() ;
+  std::string dirsep(1,CoinFindDirSeparator()) ;
+  std::string upOne = ".."+dirsep ;
   std::string pathTmp ;
-
-  pathTmp = ".." ;
-  pathTmp += dirsep ;
-  pathTmp += ".." ;
-  pathTmp += dirsep ;
-  pathTmp += "Data" ;
-  pathTmp += dirsep ;
-
-  parms["-mpsDir"] = pathTmp + "Sample"  ;
-  parms["-netlibDir"] = pathTmp + "Netlib" ;
-
+/*
+  Establish likely defaults for the Sample and Miplib directories.
+*/
+# ifdef SAMPLEDIR
+    pathTmp = SAMPLEDIR ;
+# else
+    pathTmp = upOne+upOne+"Data"+dirsep+"Sample" ;
+# endif
+  parms["-mpsDir"] = pathTmp  ;
+# ifdef NETLIBDIR
+    pathTmp = NETLIBDIR ;
+# else
+    pathTmp = upOne+upOne+"Data"+dirsep+"Netlib" ;
+# endif
+  parms["-netlibDir"] = pathTmp ;
 /*
   Read the command line parameters and fill a map of parameter keys and
@@ -196 +201 @@
 */
   WindowsErrorPopupBlocker();
-
 /*
   Process command line parameters.