Skip to content

Commit e4fb58c

Browse files
committed
format fix
1 parent 40a3c55 commit e4fb58c

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

ortools/linear_solver/proto_solver/highs_proto_solver.cc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void HighsCallbackAdapter(int callback_type, const std::string& message,
6060
}
6161
}
6262

63-
}
63+
} // namespace
6464

6565
absl::StatusOr<MPSolutionResponse> HighsSolveProto(
6666
LazyMutableCopy<MPModelRequest> request, HighsSolveInfo* solve_info,
@@ -103,9 +103,10 @@ absl::StatusOr<MPSolutionResponse> HighsSolveProto(
103103
highs.setOptionValue("log_to_console", true);
104104
highs.setOptionValue("output_flag", true);
105105
if (logging_callback != nullptr && *logging_callback) {
106-
if (highs.setCallback(HighsCallbackAdapter,
107-
const_cast<std::function<void(const std::string&)>*>(
108-
logging_callback)) != HighsStatus::kOk) {
106+
if (highs.setCallback(
107+
HighsCallbackAdapter,
108+
const_cast<std::function<void(const std::string&)>*>(
109+
logging_callback)) != HighsStatus::kOk) {
109110
response.set_status(MPSOLVER_ABNORMAL);
110111
response.set_status_str("HiGHS setCallback failed");
111112
return response;

ortools/linear_solver/wrappers/model_builder_helper.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,8 @@ void ModelSolverHelper::Solve(const ModelBuilderHelper& model) {
620620
case MPModelRequest::HIGHS_LINEAR_PROGRAMMING: // ABSL_FALLTHROUGH_INTENDED
621621
case MPModelRequest::HIGHS_MIXED_INTEGER_PROGRAMMING: {
622622
// TODO(user): Enable interrupt_solve.
623-
const auto temp = HighsSolveProto(std::move(request), nullptr, &log_callback_);
623+
const auto temp =
624+
HighsSolveProto(std::move(request), nullptr, &log_callback_);
624625
if (temp.ok()) {
625626
response_ = std::move(temp.value());
626627
}

ortools/routing/routing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ class OR_DLL Model {
274274
using TransitCallback1 = ::operations_research::routing::TransitCallback1;
275275
using TransitCallback2 = ::operations_research::routing::TransitCallback2;
276276
using CumulDependentTransitCallback2 =
277-
::operations_research::routing::CumulDependentTransitCallback2;
277+
::operations_research::routing::CumulDependentTransitCallback2;
278278
#endif // !defined(SWIG)
279279

280280
#if !defined(SWIG)

0 commit comments

Comments
 (0)