Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Minor changes to allow building with g++ 4.9
  • Loading branch information
tkralphs committed Jan 7, 2022
1 parent d1c1ea5 commit 778c830
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions scripts/experiments.py
Expand Up @@ -14,8 +14,8 @@
}

versions = {
'before' : '/home/ted/Projects/build-cbc-before/bin/cbc',
# 'after' : '/home/ted/Projects/build-cbc-master/bin/cbc'
# 'before' : '/home/ted/Projects/build-cbc-before/bin/cbc',
'after' : '/home/ted/Projects/build-cbc-master/bin/cbc'
}

# Output parent path
Expand Down
2 changes: 1 addition & 1 deletion src/CbcModel.cpp
Expand Up @@ -1893,7 +1893,7 @@ void CbcModel::branchAndBound(int doStatistics)
if (flipObjective) {
// In solver_ cutoff is correct with sign reversed
double cutoff;
solver_->getDblParam(OsiDblParam::OsiDualObjectiveLimit,cutoff);
solver_->getDblParam(OsiDualObjectiveLimit,cutoff);
// treat as if minimize
assert(fabs(dblParam_[CbcCurrentCutoff]) == fabs(cutoff) ||
fabs(cutoff)>1.0e40);
Expand Down
2 changes: 1 addition & 1 deletion src/CbcSolver.cpp
Expand Up @@ -4859,7 +4859,7 @@ int CbcMain1(std::deque<std::string> inputQueue, CbcModel &model,
// check if odd name
if (columnName[0]=='N') {
try {
int sequence = stoi(columnName.substr(1));
int sequence = std::atoi(columnName.substr(1).c_str());
oddColumn = sequence+1;
} catch (...) {
}
Expand Down

0 comments on commit 778c830

Please sign in to comment.