Skip to content

Commit

Permalink
Merge branch 'main' into scorpion
Browse files Browse the repository at this point in the history
  • Loading branch information
jendrikseipp committed Jan 9, 2024
2 parents 5c53470 + a598ba4 commit 4859a70
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion misc/style/run-clang-tidy.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def check_search_code_with_clang_tidy():
# Enable with CheckTriviallyCopyableMove=0 when we require
# clang-tidy >= 6.0 (see issue856).
# "performance-move-const-arg",
#"performance-move-constructor-init",
"performance-move-constructor-init",
"performance-no-automatic-move",
# "performance-no-int-to-ptr",
# "performance-noexcept-destructor",
Expand Down
2 changes: 1 addition & 1 deletion src/search/potentials/potential_optimizer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void PotentialOptimizer::optimize_for_samples(const vector<State> &samples) {
solve_and_extract();
}

const shared_ptr<AbstractTask> PotentialOptimizer::get_task() const {
shared_ptr<AbstractTask> PotentialOptimizer::get_task() const {
return task;
}

Expand Down
2 changes: 1 addition & 1 deletion src/search/potentials/potential_optimizer.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class PotentialOptimizer {
explicit PotentialOptimizer(const plugins::Options &opts);
~PotentialOptimizer() = default;

const std::shared_ptr<AbstractTask> get_task() const;
std::shared_ptr<AbstractTask> get_task() const;
bool potentials_are_bounded() const;

void optimize_for_state(const State &state);
Expand Down

0 comments on commit 4859a70

Please sign in to comment.