Changeset 1549 for trunk/Cbc/test


Ignore:
Timestamp:
Dec 8, 2010 2:28:52 PM (9 years ago)
Author:
lou
Message:

Make Visual Studio v9 build work again.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/test/osiUnitTest.cpp

    r1464 r1549  
    6060  Set default values for data directories.
    6161*/
    62   const char dirsep =  CoinFindDirSeparator() ;
     62  std::string dirsep(1,CoinFindDirSeparator()) ;
     63  std::string upOne = ".."+dirsep ;
    6364  std::string pathTmp ;
    64 
    65   pathTmp = ".." ;
    66   pathTmp += dirsep ;
    67   pathTmp += ".." ;
    68   pathTmp += dirsep ;
    69   pathTmp += "Data" ;
    70   pathTmp += dirsep ;
    71 
    72   parms["-mpsDir"] = pathTmp + "Sample"  ;
    73   parms["-netlibDir"] = pathTmp + "Netlib" ;
    74 
     65/*
     66  Establish likely defaults for the Sample and Miplib directories.
     67*/
     68# ifdef SAMPLEDIR
     69    pathTmp = SAMPLEDIR ;
     70# else
     71    pathTmp = upOne+upOne+"Data"+dirsep+"Sample" ;
     72# endif
     73  parms["-mpsDir"] = pathTmp  ;
     74# ifdef NETLIBDIR
     75    pathTmp = NETLIBDIR ;
     76# else
     77    pathTmp = upOne+upOne+"Data"+dirsep+"Netlib" ;
     78# endif
     79  parms["-netlibDir"] = pathTmp ;
    7580/*
    7681  Read the command line parameters and fill a map of parameter keys and
     
    196201*/
    197202  WindowsErrorPopupBlocker();
    198 
    199203/*
    200204  Process command line parameters.
Note: See TracChangeset for help on using the changeset viewer.