From e4db82395273fadfb0ef949b0b6fe98acef5bcda Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Fri, 25 Aug 2023 03:51:16 +0200 Subject: [PATCH] more include cleaning --- ortools/base/BUILD.bazel | 24 +++++++++---------- ortools/base/adjustable_priority_queue.h | 6 ++--- ortools/base/base.i | 2 -- ortools/base/bitmap.cc | 4 +--- ortools/base/bitmap.h | 3 +-- ortools/base/container_logging.h | 2 +- ortools/base/file.h | 2 +- ortools/base/gzipfile.h | 7 +----- ortools/base/hash.h | 3 +-- ortools/base/mathutil.h | 3 +-- ortools/base/stl_util.h | 2 +- ortools/base/strtoint.h | 1 - ortools/base/sysinfo.h | 2 +- ortools/base/timer.h | 3 ++- ortools/base/vlog.h | 1 - ortools/base/vlog_is_on.h | 3 ++- ortools/flatzinc/parser.lex | 2 +- ortools/linear_solver/BUILD.bazel | 1 + ortools/linear_solver/bop_interface.cc | 1 - ortools/linear_solver/cbc_interface.cc | 1 - ortools/linear_solver/clp_interface.cc | 1 - ortools/linear_solver/cplex_interface.cc | 2 +- ortools/linear_solver/glop_interface.cc | 1 - ortools/linear_solver/glpk_interface.cc | 1 - ortools/linear_solver/gurobi_interface.cc | 1 - ortools/linear_solver/linear_solver.cc | 1 - ortools/linear_solver/linear_solver.h | 15 +++++++----- .../linear_solver/linear_solver_callback.h | 1 - ortools/linear_solver/model_exporter.cc | 1 - ortools/linear_solver/sat_interface.cc | 1 - ortools/linear_solver/scip_interface.cc | 1 - .../wrappers/model_builder_helper.cc | 1 + ortools/linear_solver/xpress_interface.cc | 2 +- ortools/sat/cuts.cc | 1 - ortools/util/BUILD.bazel | 1 + ortools/util/filelineiter.h | 1 + ortools/util/functions_swig_helpers.h | 1 - ortools/util/time_limit.h | 4 +--- 38 files changed, 43 insertions(+), 67 deletions(-) diff --git a/ortools/base/BUILD.bazel b/ortools/base/BUILD.bazel index 9e7ea78a8b..96e33f6b5c 100644 --- a/ortools/base/BUILD.bazel +++ b/ortools/base/BUILD.bazel @@ -46,6 +46,7 @@ cc_library( "init_google.h", "logging.h", "stl_logging.h", + "types.h", "version.h", ], copts = [ @@ -61,9 +62,9 @@ cc_library( }), deps = [ ":commandlineflags", - ":types", ":logging", ":macros", + ":types", "@com_google_absl//absl/base", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", @@ -92,20 +93,18 @@ cc_library( ], deps = [ ":base", - ":types", ], ) cc_library( - name = "types", - hdrs = ["types.h"], + name = "basictypes", + hdrs = ["basictypes.h"], ) cc_library( name = "bitmap", srcs = ["bitmap.cc"], hdrs = ["bitmap.h"], - deps = [":types"], ) cc_library( @@ -235,7 +234,7 @@ cc_library( hdrs = ["gzipfile.h"], deps = [ ":base", - ":types", + ":basictypes", ":file", ":path", "@com_google_absl//absl/strings", @@ -261,7 +260,6 @@ cc_library( "hash.h", ], deps = [ - ":types", "@com_google_absl//absl/strings", ], ) @@ -317,6 +315,11 @@ cc_library( ], ) +cc_library( + name = "types", + hdrs = ["types.h"], +) + cc_library( name = "vlog", srcs = ["vlog_is_on.cc"], @@ -325,7 +328,6 @@ cc_library( "vlog_is_on.h", ], deps = [ - ":types", "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/log", "@com_google_absl//absl/log:check", @@ -348,7 +350,6 @@ cc_library( hdrs = ["mathutil.h"], deps = [ ":base", - ":types", ], ) @@ -483,7 +484,6 @@ cc_library( srcs = ["strtoint.cc"], hdrs = ["strtoint.h"], deps = [ - ":types", "@com_google_absl//absl/log:check", "@com_google_absl//absl/strings", ], @@ -494,7 +494,6 @@ cc_library( srcs = ["sysinfo.cc"], hdrs = ["sysinfo.h"], deps = [ - ":types", "@com_google_absl//absl/strings", ], ) @@ -514,7 +513,6 @@ cc_library( srcs = ["timer.cc"], hdrs = ["timer.h"], deps = [ - ":types", ":macros", "@com_google_absl//absl/log:check", "@com_google_absl//absl/time", @@ -531,7 +529,7 @@ cc_library( srcs = ["zipfile.cc"], hdrs = ["zipfile.h"], deps = [ - ":types", + ":basictypes", ":file", ":path", ":stl_util", diff --git a/ortools/base/adjustable_priority_queue.h b/ortools/base/adjustable_priority_queue.h index 14a86bbb1e..967c869348 100644 --- a/ortools/base/adjustable_priority_queue.h +++ b/ortools/base/adjustable_priority_queue.h @@ -20,8 +20,6 @@ #include #include -#include "ortools/base/types.h" -#include "ortools/base/logging.h" #include "ortools/base/macros.h" template @@ -39,8 +37,8 @@ class AdjustablePriorityQueue { public: // The objects references 'c' and 'm' are not required to be alive for the // lifetime of this object. - AdjustablePriorityQueue() {} - AdjustablePriorityQueue(const Comp& c) : c_(c) {} + AdjustablePriorityQueue() = default; + explicit AdjustablePriorityQueue(const Comp& c) : c_(c) {} AdjustablePriorityQueue(const AdjustablePriorityQueue&) = delete; AdjustablePriorityQueue& operator=(const AdjustablePriorityQueue&) = delete; AdjustablePriorityQueue(AdjustablePriorityQueue&&) = default; diff --git a/ortools/base/base.i b/ortools/base/base.i index f28dbbcb28..cbd526f330 100644 --- a/ortools/base/base.i +++ b/ortools/base/base.i @@ -15,8 +15,6 @@ #include #include #include - -#include "ortools/base/types.h" %} %include "typemaps.i" diff --git a/ortools/base/bitmap.cc b/ortools/base/bitmap.cc index 981d6c9a91..04786cccc3 100644 --- a/ortools/base/bitmap.cc +++ b/ortools/base/bitmap.cc @@ -13,9 +13,7 @@ #include "ortools/base/bitmap.h" -#include - -#include "ortools/base/types.h" +#include namespace operations_research { diff --git a/ortools/base/bitmap.h b/ortools/base/bitmap.h index 24318fb4ac..eb64833328 100644 --- a/ortools/base/bitmap.h +++ b/ortools/base/bitmap.h @@ -15,10 +15,9 @@ #define OR_TOOLS_BASE_BITMAP_H_ #include +#include #include -#include "ortools/base/types.h" - namespace operations_research { namespace internal { inline uint64_t OneBit64(int pos) { return uint64_t{1} << pos; } diff --git a/ortools/base/container_logging.h b/ortools/base/container_logging.h index 078082b6b9..1d86e7e139 100644 --- a/ortools/base/container_logging.h +++ b/ortools/base/container_logging.h @@ -34,6 +34,7 @@ #ifndef OR_TOOLS_BASE_CONTAINER_LOGGING_H_ #define OR_TOOLS_BASE_CONTAINER_LOGGING_H_ +#include #include #include #include @@ -41,7 +42,6 @@ #include #include "absl/base/port.h" -#include "ortools/base/types.h" namespace gtl { diff --git a/ortools/base/file.h b/ortools/base/file.h index c507032c08..e184bbecc0 100644 --- a/ortools/base/file.h +++ b/ortools/base/file.h @@ -14,6 +14,7 @@ #ifndef OR_TOOLS_BASE_FILE_H_ #define OR_TOOLS_BASE_FILE_H_ +#include #include #include #include @@ -24,7 +25,6 @@ #include "google/protobuf/io/tokenizer.h" #include "google/protobuf/message.h" #include "google/protobuf/text_format.h" -#include "ortools/base/types.h" #include "ortools/base/logging.h" #include "ortools/base/status_macros.h" diff --git a/ortools/base/gzipfile.h b/ortools/base/gzipfile.h index 0777c206a9..70ca60cd3d 100644 --- a/ortools/base/gzipfile.h +++ b/ortools/base/gzipfile.h @@ -15,7 +15,7 @@ #define OR_TOOLS_BASE_GZIPFILE_H_ #include "absl/strings/string_view.h" -#include "ortools/base/types.h" // for Ownership enum +#include "ortools/base/basictypes.h" // for Ownership enum #include "zlib.h" // for Z_DEFAULT_COMPRESSION class File; @@ -28,11 +28,6 @@ enum class AppendedStreams { kIgnoreAppendedData, }; -// Argument type used in interfaces that can optionally take ownership -// of a passed in argument. If TAKE_OWNERSHIP is passed, the called -// object takes ownership of the argument. Otherwise it does not. -enum Ownership { DO_NOT_TAKE_OWNERSHIP, TAKE_OWNERSHIP }; - // Return a readonly file that contains a uncompressed version of // another File. // diff --git a/ortools/base/hash.h b/ortools/base/hash.h index 6db76e7e8f..5b9cef5089 100644 --- a/ortools/base/hash.h +++ b/ortools/base/hash.h @@ -15,11 +15,10 @@ #define OR_TOOLS_BASE_HASH_H_ #include +#include #include #include -#include "ortools/base/types.h" - // In SWIG mode, we don't want anything besides these top-level includes. #if !defined(SWIG) diff --git a/ortools/base/mathutil.h b/ortools/base/mathutil.h index ce6171b711..916b70d0ca 100644 --- a/ortools/base/mathutil.h +++ b/ortools/base/mathutil.h @@ -17,11 +17,10 @@ #include #include +#include #include #include "absl/base/casts.h" -#include "ortools/base/types.h" -#include "ortools/base/types.h" #include "ortools/base/logging.h" #include "ortools/base/macros.h" diff --git a/ortools/base/stl_util.h b/ortools/base/stl_util.h index 803f0085f5..d3be62e821 100644 --- a/ortools/base/stl_util.h +++ b/ortools/base/stl_util.h @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -32,7 +33,6 @@ #include "absl/meta/type_traits.h" #include "absl/strings/internal/resize_uninitialized.h" -#include "ortools/base/types.h" #include "ortools/base/macros.h" namespace gtl { diff --git a/ortools/base/strtoint.h b/ortools/base/strtoint.h index a92710153c..f8c871c967 100644 --- a/ortools/base/strtoint.h +++ b/ortools/base/strtoint.h @@ -46,7 +46,6 @@ #include "absl/base/port.h" // disable some warnings on Windows #include "absl/strings/string_view.h" -#include "ortools/base/types.h" namespace operations_research { diff --git a/ortools/base/sysinfo.h b/ortools/base/sysinfo.h index d997e65968..5e7ca3af23 100644 --- a/ortools/base/sysinfo.h +++ b/ortools/base/sysinfo.h @@ -14,7 +14,7 @@ #ifndef OR_TOOLS_BASE_SYSINFO_H_ #define OR_TOOLS_BASE_SYSINFO_H_ -#include "ortools/base/types.h" +#include namespace operations_research { // Returns the memory usage of the process. diff --git a/ortools/base/timer.h b/ortools/base/timer.h index 06b5f780e1..cf94353277 100644 --- a/ortools/base/timer.h +++ b/ortools/base/timer.h @@ -14,10 +14,11 @@ #ifndef OR_TOOLS_BASE_TIMER_H_ #define OR_TOOLS_BASE_TIMER_H_ +#include + #include "absl/log/check.h" #include "absl/time/clock.h" #include "absl/time/time.h" -#include "ortools/base/types.h" #include "ortools/base/macros.h" class WallTimer { diff --git a/ortools/base/vlog.h b/ortools/base/vlog.h index 861af02d67..3f67886618 100644 --- a/ortools/base/vlog.h +++ b/ortools/base/vlog.h @@ -31,7 +31,6 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" -#include "ortools/base/types.h" #include "ortools/base/vlog_is_on.h" // Log only in verbose mode. diff --git a/ortools/base/vlog_is_on.h b/ortools/base/vlog_is_on.h index 2742f860c9..548e3dca94 100644 --- a/ortools/base/vlog_is_on.h +++ b/ortools/base/vlog_is_on.h @@ -14,9 +14,10 @@ #ifndef OR_TOOLS_BASE_VLOG_IS_ON_H_ #define OR_TOOLS_BASE_VLOG_IS_ON_H_ +#include + #include "absl/flags/declare.h" #include "absl/log/log.h" -#include "ortools/base/types.h" ABSL_DECLARE_FLAG(int, v); diff --git a/ortools/flatzinc/parser.lex b/ortools/flatzinc/parser.lex index 2a0f2015e4..1ae81b8104 100644 --- a/ortools/flatzinc/parser.lex +++ b/ortools/flatzinc/parser.lex @@ -8,8 +8,8 @@ %option prefix="orfz_" %{ +#include #include -#include "ortools/base/integral_types.h" #include "absl/strings/numbers.h" #include "ortools/flatzinc/parser.tab.hh" #if defined(_MSC_VER) diff --git a/ortools/linear_solver/BUILD.bazel b/ortools/linear_solver/BUILD.bazel index c300551255..eba622ca9a 100644 --- a/ortools/linear_solver/BUILD.bazel +++ b/ortools/linear_solver/BUILD.bazel @@ -261,6 +261,7 @@ cc_library( "//ortools/base:accurate_sum", "//ortools/base:dynamic_library", "//ortools/base:hash", + "//ortools/base:logging", "//ortools/base:map_util", "//ortools/base:status_macros", "//ortools/base:stl_util", diff --git a/ortools/linear_solver/bop_interface.cc b/ortools/linear_solver/bop_interface.cc index 73440f377f..a9d0f2dac0 100644 --- a/ortools/linear_solver/bop_interface.cc +++ b/ortools/linear_solver/bop_interface.cc @@ -27,7 +27,6 @@ #include "ortools/base/hash.h" #include "ortools/base/helpers.h" #include "ortools/base/logging.h" -#include "ortools/base/types.h" #include "ortools/bop/bop_parameters.pb.h" #include "ortools/bop/integral_solver.h" #include "ortools/linear_solver/linear_solver.h" diff --git a/ortools/linear_solver/cbc_interface.cc b/ortools/linear_solver/cbc_interface.cc index 86fee02462..eea4fcd866 100644 --- a/ortools/linear_solver/cbc_interface.cc +++ b/ortools/linear_solver/cbc_interface.cc @@ -28,7 +28,6 @@ #include "ortools/base/hash.h" #include "ortools/base/logging.h" #include "ortools/base/timer.h" -#include "ortools/base/types.h" #include "ortools/linear_solver/linear_solver.h" #undef PACKAGE diff --git a/ortools/linear_solver/clp_interface.cc b/ortools/linear_solver/clp_interface.cc index f4616932e5..a925b4d39e 100644 --- a/ortools/linear_solver/clp_interface.cc +++ b/ortools/linear_solver/clp_interface.cc @@ -28,7 +28,6 @@ #include "ortools/base/hash.h" #include "ortools/base/logging.h" #include "ortools/base/timer.h" -#include "ortools/base/types.h" #include "ortools/linear_solver/linear_solver.h" #undef PACKAGE diff --git a/ortools/linear_solver/cplex_interface.cc b/ortools/linear_solver/cplex_interface.cc index e11813cad9..137d8fe82c 100644 --- a/ortools/linear_solver/cplex_interface.cc +++ b/ortools/linear_solver/cplex_interface.cc @@ -14,6 +14,7 @@ // Initial version of this code was written by Daniel Junglas (IBM) #if defined(USE_CPLEX) +#include #include #include @@ -21,7 +22,6 @@ #include "absl/strings/str_split.h" #include "ortools/base/logging.h" #include "ortools/base/timer.h" -#include "ortools/base/types.h" #include "ortools/linear_solver/linear_solver.h" extern "C" { diff --git a/ortools/linear_solver/glop_interface.cc b/ortools/linear_solver/glop_interface.cc index 546906154b..0824846702 100644 --- a/ortools/linear_solver/glop_interface.cc +++ b/ortools/linear_solver/glop_interface.cc @@ -21,7 +21,6 @@ #include "absl/base/attributes.h" #include "ortools/base/logging.h" -#include "ortools/base/types.h" #include "ortools/glop/lp_solver.h" #include "ortools/glop/parameters.pb.h" #include "ortools/linear_solver/glop_utils.h" diff --git a/ortools/linear_solver/glpk_interface.cc b/ortools/linear_solver/glpk_interface.cc index cdd0c27b4a..1aae3939a6 100644 --- a/ortools/linear_solver/glpk_interface.cc +++ b/ortools/linear_solver/glpk_interface.cc @@ -30,7 +30,6 @@ #include "ortools/base/hash.h" #include "ortools/base/logging.h" #include "ortools/base/timer.h" -#include "ortools/base/types.h" #include "ortools/glpk/glpk_env_deleter.h" #include "ortools/linear_solver/linear_solver.h" diff --git a/ortools/linear_solver/gurobi_interface.cc b/ortools/linear_solver/gurobi_interface.cc index a70e0f4d6a..5a76943e84 100644 --- a/ortools/linear_solver/gurobi_interface.cc +++ b/ortools/linear_solver/gurobi_interface.cc @@ -64,7 +64,6 @@ #include "ortools/base/logging.h" #include "ortools/base/map_util.h" #include "ortools/base/timer.h" -#include "ortools/base/types.h" #include "ortools/gurobi/environment.h" #include "ortools/linear_solver/linear_solver.h" #include "ortools/linear_solver/linear_solver_callback.h" diff --git a/ortools/linear_solver/linear_solver.cc b/ortools/linear_solver/linear_solver.cc index aeb6089841..4286592a35 100644 --- a/ortools/linear_solver/linear_solver.cc +++ b/ortools/linear_solver/linear_solver.cc @@ -45,7 +45,6 @@ #include "ortools/base/map_util.h" #include "ortools/base/stl_util.h" #include "ortools/base/threadpool.h" -#include "ortools/base/types.h" #include "ortools/linear_solver/linear_solver.pb.h" #include "ortools/linear_solver/model_exporter.h" #include "ortools/linear_solver/model_validator.h" diff --git a/ortools/linear_solver/linear_solver.h b/ortools/linear_solver/linear_solver.h index 74237650b5..bf0df260de 100644 --- a/ortools/linear_solver/linear_solver.h +++ b/ortools/linear_solver/linear_solver.h @@ -138,7 +138,6 @@ #include #include #include -#include #include #include #include @@ -146,17 +145,21 @@ #include #include +#include "absl/base/attributes.h" #include "absl/base/port.h" -#include "absl/flags/parse.h" -#include "absl/flags/usage.h" +#include "absl/base/thread_annotations.h" +#include "absl/container/flat_hash_map.h" +#include "absl/flags/declare.h" +#include "absl/log/check.h" #include "absl/status/status.h" -#include "absl/strings/match.h" #include "absl/strings/str_format.h" +#include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" +#include "absl/time/clock.h" +#include "absl/time/time.h" #include "absl/types/optional.h" #include "ortools/base/logging.h" #include "ortools/base/macros.h" -#include "ortools/base/timer.h" -#include "ortools/base/types.h" #include "ortools/linear_solver/linear_expr.h" #include "ortools/linear_solver/linear_solver.pb.h" #include "ortools/linear_solver/linear_solver_callback.h" diff --git a/ortools/linear_solver/linear_solver_callback.h b/ortools/linear_solver/linear_solver_callback.h index 27cac69090..fee5a496a0 100644 --- a/ortools/linear_solver/linear_solver_callback.h +++ b/ortools/linear_solver/linear_solver_callback.h @@ -21,7 +21,6 @@ #include #include "absl/container/flat_hash_map.h" -#include "ortools/base/types.h" namespace operations_research { diff --git a/ortools/linear_solver/model_exporter.cc b/ortools/linear_solver/model_exporter.cc index 4ca41f5e89..5d54389122 100644 --- a/ortools/linear_solver/model_exporter.cc +++ b/ortools/linear_solver/model_exporter.cc @@ -31,7 +31,6 @@ #include "ortools/base/commandlineflags.h" #include "ortools/base/logging.h" #include "ortools/base/map_util.h" -#include "ortools/base/types.h" #include "ortools/linear_solver/linear_solver.pb.h" #include "ortools/util/fp_utils.h" diff --git a/ortools/linear_solver/sat_interface.cc b/ortools/linear_solver/sat_interface.cc index c9b696fce8..a08ce62c2d 100644 --- a/ortools/linear_solver/sat_interface.cc +++ b/ortools/linear_solver/sat_interface.cc @@ -22,7 +22,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "ortools/base/logging.h" -#include "ortools/base/types.h" #include "ortools/linear_solver/linear_solver.h" #include "ortools/linear_solver/linear_solver.pb.h" #include "ortools/linear_solver/proto_solver/sat_proto_solver.h" diff --git a/ortools/linear_solver/scip_interface.cc b/ortools/linear_solver/scip_interface.cc index 8075bd973f..a7c8f5b6eb 100644 --- a/ortools/linear_solver/scip_interface.cc +++ b/ortools/linear_solver/scip_interface.cc @@ -35,7 +35,6 @@ #include "ortools/base/logging.h" #include "ortools/base/status_macros.h" #include "ortools/base/timer.h" -#include "ortools/base/types.h" #include "ortools/gscip/legacy_scip_params.h" #include "ortools/linear_solver/linear_solver.h" #include "ortools/linear_solver/linear_solver.pb.h" diff --git a/ortools/linear_solver/wrappers/model_builder_helper.cc b/ortools/linear_solver/wrappers/model_builder_helper.cc index 5d94edc23c..9b08026f7b 100644 --- a/ortools/linear_solver/wrappers/model_builder_helper.cc +++ b/ortools/linear_solver/wrappers/model_builder_helper.cc @@ -21,6 +21,7 @@ #include #include +#include "absl/strings/match.h" #include "ortools/base/helpers.h" #include "ortools/base/options.h" #include "ortools/linear_solver/linear_solver.h" diff --git a/ortools/linear_solver/xpress_interface.cc b/ortools/linear_solver/xpress_interface.cc index 4b01b250b6..11040b2cdf 100644 --- a/ortools/linear_solver/xpress_interface.cc +++ b/ortools/linear_solver/xpress_interface.cc @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -27,7 +28,6 @@ #include "absl/strings/str_format.h" #include "ortools/base/logging.h" #include "ortools/base/timer.h" -#include "ortools/base/types.h" #include "ortools/linear_solver/linear_solver.h" extern "C" { diff --git a/ortools/sat/cuts.cc b/ortools/sat/cuts.cc index 6cf00e497a..2003ef4f88 100644 --- a/ortools/sat/cuts.cc +++ b/ortools/sat/cuts.cc @@ -46,7 +46,6 @@ #include "ortools/util/sorted_interval_list.h" #include "ortools/util/strong_integers.h" - namespace operations_research { namespace sat { diff --git a/ortools/util/BUILD.bazel b/ortools/util/BUILD.bazel index f0ad89da21..a59d215071 100644 --- a/ortools/util/BUILD.bazel +++ b/ortools/util/BUILD.bazel @@ -242,6 +242,7 @@ cc_library( "//ortools/base", "//ortools/base:sysinfo", "//ortools/base:timer", + "//ortools/base:types", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", diff --git a/ortools/util/filelineiter.h b/ortools/util/filelineiter.h index c56d8f43cd..b1839ac64e 100644 --- a/ortools/util/filelineiter.h +++ b/ortools/util/filelineiter.h @@ -26,6 +26,7 @@ #define OR_TOOLS_UTIL_FILELINEITER_H_ #include +#include #include #include "ortools/base/file.h" diff --git a/ortools/util/functions_swig_helpers.h b/ortools/util/functions_swig_helpers.h index d8db95fb81..68cbad4b24 100644 --- a/ortools/util/functions_swig_helpers.h +++ b/ortools/util/functions_swig_helpers.h @@ -18,7 +18,6 @@ // in Java. It is #included by java/functions.i. #include -#include #include namespace operations_research { diff --git a/ortools/util/time_limit.h b/ortools/util/time_limit.h index b9c746a9fc..b74c99d0d5 100644 --- a/ortools/util/time_limit.h +++ b/ortools/util/time_limit.h @@ -16,20 +16,18 @@ #include #include -#include #include #include #include #include -#include "absl/base/port.h" #include "absl/container/flat_hash_map.h" #include "absl/flags/declare.h" #include "absl/synchronization/mutex.h" #include "absl/time/clock.h" -#include "ortools/base/logging.h" #include "ortools/base/macros.h" #include "ortools/base/timer.h" +#include "ortools/base/types.h" #include "ortools/util/running_stat.h" /**