Skip to content

Commit

Permalink
Merge pull request #1997 from ERGO-Code/fix-warnings
Browse files Browse the repository at this point in the history
fix 2 compiler warnings from 1.8.0
  • Loading branch information
jajhall authored Oct 25, 2024
2 parents cceea9a + df38b5c commit 69a1848
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/lp_data/HighsOptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -524,10 +524,10 @@ struct HighsOptionsStruct {
less_infeasible_DSE_choose_row(false),
use_original_HFactor_logic(false),
run_centring(false),
max_centring_steps(0),
centring_ratio_tolerance(0.0),
primal_residual_tolerance(0.0),
dual_residual_tolerance(0.0),
max_centring_steps(0),
centring_ratio_tolerance(0.0),
icrash(false),
icrash_dualize(false),
icrash_strategy(""),
Expand Down
3 changes: 1 addition & 2 deletions src/parallel/HighsTaskExecutor.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ class HighsTaskExecutor {

for (int i = 1, numThreads = static_cast<int>(workerDeques.size());
i < numThreads; ++i) {
workerThreads.emplace_back(
std::move(std::thread(&HighsTaskExecutor::run_worker, i, this)));
workerThreads.emplace_back(&HighsTaskExecutor::run_worker, i, this);
}
}

Expand Down

0 comments on commit 69a1848

Please sign in to comment.