Ignore:
Timestamp:
Sep 30, 2010 10:07:56 AM (9 years ago)
Author:
tkr
Message:

Merging r1508 from trunk

Location:
stable/2.5
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/2.5

    • Property svn:mergeinfo changed
      /trunk (added)merged: 1508
  • stable/2.5/Cbc

  • stable/2.5/Cbc/src/CbcSolver.cpp

    r1456 r1510  
    53455345                                    babModel_->setNodeComparison(compare);
    53465346                                }
    5347 #if defined(CBC_OTHER_SOLVER)||defined(COIN_HAS_CPX)
     5347#if CBC_OTHER_SOLVER==1
    53485348                                if (dynamic_cast<OsiCpxSolverInterface *> (babModel_->solver()))
    53495349                                    babModel_->solver()->messageHandler()->setLogLevel(0);
Note: See TracChangeset for help on using the changeset viewer.