Changeset 1607 for trunk/Cbc


Ignore:
Timestamp:
Mar 4, 2011 11:15:41 AM (9 years ago)
Author:
lou
Message:

Make logLevel command work again. New build system does not define
COIN_HAS_CBC in cbc. Remove useless include from CoinSolve?.

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcSolver.cpp

    r1595 r1607  
    4242
    4343#include "ClpPresolve.hpp"
     44#ifndef COIN_HAS_CBC
     45#define COIN_HAS_CBC
     46#endif
    4447#include "CbcOrClpParam.hpp"
    4548#include "OsiRowCutDebugger.hpp"
  • trunk/Cbc/src/CoinSolve.cpp

    r1573 r1607  
    1212#include "CoinPragma.hpp"
    1313#include "CbcModel.hpp"
    14 #include "CbcOrClpParam.hpp"
    1514#include "OsiClpSolverInterface.hpp"
    1615
Note: See TracChangeset for help on using the changeset viewer.