From b34ed29c74fb14fa9062af8545c3499b9842d0ae Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 12 Jun 2023 11:55:56 +0200 Subject: [PATCH] format sync --- ortools/base/linked_hash_map.h | 1 - ortools/linear_solver/cplex_interface.cc | 1 - ortools/linear_solver/glpk_interface.cc | 1 - ortools/linear_solver/linear_solver.cc | 2 -- ortools/util/proto_tools.cc | 1 + ortools/util/proto_tools.h | 1 + 6 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ortools/base/linked_hash_map.h b/ortools/base/linked_hash_map.h index 8d362bd20f..fd69454c23 100644 --- a/ortools/base/linked_hash_map.h +++ b/ortools/base/linked_hash_map.h @@ -403,7 +403,6 @@ class linked_hash_map { template mapped_type& operator[](key_arg&& key) { - // K* = nullptr parameter above. return LazyEmplaceInternal(std::forward(key)).first->second; } diff --git a/ortools/linear_solver/cplex_interface.cc b/ortools/linear_solver/cplex_interface.cc index 4d065a8b4d..46b5a730bb 100644 --- a/ortools/linear_solver/cplex_interface.cc +++ b/ortools/linear_solver/cplex_interface.cc @@ -25,7 +25,6 @@ #include "ortools/linear_solver/linear_solver.h" extern "C" { - #include "ilcplex/cplexx.h" // This is an undocumented function, setting the objective offset // is not supported everywhere (for example it may not be exported if a diff --git a/ortools/linear_solver/glpk_interface.cc b/ortools/linear_solver/glpk_interface.cc index 5e97635e8a..48eb69c1db 100644 --- a/ortools/linear_solver/glpk_interface.cc +++ b/ortools/linear_solver/glpk_interface.cc @@ -11,7 +11,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// #if defined(USE_GLPK) #include diff --git a/ortools/linear_solver/linear_solver.cc b/ortools/linear_solver/linear_solver.cc index 7bf59c33a3..45f08accea 100644 --- a/ortools/linear_solver/linear_solver.cc +++ b/ortools/linear_solver/linear_solver.cc @@ -11,8 +11,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// - #include "ortools/linear_solver/linear_solver.h" #if !defined(_MSC_VER) diff --git a/ortools/util/proto_tools.cc b/ortools/util/proto_tools.cc index e10fba0570..8aac321467 100644 --- a/ortools/util/proto_tools.cc +++ b/ortools/util/proto_tools.cc @@ -21,6 +21,7 @@ #include "google/protobuf/text_format.h" namespace operations_research { + namespace { using ::google::protobuf::Descriptor; using ::google::protobuf::FieldDescriptor; diff --git a/ortools/util/proto_tools.h b/ortools/util/proto_tools.h index f146c7650c..ffaafdf330 100644 --- a/ortools/util/proto_tools.h +++ b/ortools/util/proto_tools.h @@ -22,6 +22,7 @@ #include "google/protobuf/message.h" namespace operations_research { + // Casts a generic google::protobuf::Message* to a specific proto type, or // returns an InvalidArgumentError if it doesn't seem to be of the right type. // Comes in non-const and const versions.