From c7d9318c75949ea7d3fe719fcd81e65a79b92038 Mon Sep 17 00:00:00 2001
From: Laurent Perron <lperron@google.com>
Date: Fri, 28 Apr 2017 16:17:22 +0200
Subject: [PATCH] more cleanup

---
 makefiles/Makefile.gen.mk                  | 62 ++++++++--------------
 ortools/constraint_solver/csharp/routing.i |  1 -
 ortools/graph/util.h                       |  2 +-
 ortools/linear_solver/linear_expr.cc       |  3 +-
 ortools/linear_solver/linear_expr.h        |  4 +-
 ortools/lp_data/lp_data.h                  |  1 +
 ortools/lp_data/mps_reader.h               |  1 -
 ortools/sat/disjunctive.cc                 | 13 ++---
 ortools/sat/integer.cc                     |  4 +-
 9 files changed, 36 insertions(+), 55 deletions(-)

diff --git a/makefiles/Makefile.gen.mk b/makefiles/Makefile.gen.mk
index 738574b9c1..bf0bab54c7 100644
--- a/makefiles/Makefile.gen.mk
+++ b/makefiles/Makefile.gen.mk
@@ -5,7 +5,6 @@ BASE_DEPS = \
     $(SRC_DIR)/ortools/base/casts.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
     $(SRC_DIR)/ortools/base/file.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/int_type.h \
     $(SRC_DIR)/ortools/base/join.h \
@@ -67,7 +66,6 @@ $(SRC_DIR)/ortools/base/hash.h: \
     $(SRC_DIR)/ortools/base/basictypes.h
 
 $(SRC_DIR)/ortools/base/int_type.h: \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/macros.h
 
 $(SRC_DIR)/ortools/base/int_type_indexed_vector.h: \
@@ -269,7 +267,6 @@ UTIL_DEPS = \
     $(SRC_DIR)/ortools/base/casts.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
     $(SRC_DIR)/ortools/base/file.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/int_type.h \
     $(SRC_DIR)/ortools/base/join.h \
@@ -354,7 +351,6 @@ $(SRC_DIR)/ortools/util/rcpsp_parser.h: \
     $(SRC_DIR)/ortools/base/integral_types.h
 
 $(SRC_DIR)/ortools/util/rev.h: \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/logging.h \
     $(SRC_DIR)/ortools/base/map_util.h
 
@@ -391,7 +387,6 @@ $(SRC_DIR)/ortools/util/tuple_set.h: \
     $(SRC_DIR)/ortools/base/map_util.h
 
 $(SRC_DIR)/ortools/util/vector_map.h: \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/map_util.h
 
 $(SRC_DIR)/ortools/util/vector_or_function.h: \
@@ -522,7 +517,6 @@ LP_DATA_DEPS = \
     $(SRC_DIR)/ortools/base/casts.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
     $(SRC_DIR)/ortools/base/file.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/int_type.h \
     $(SRC_DIR)/ortools/base/join.h \
@@ -639,7 +633,6 @@ $(OBJ_DIR)/lp_data/lp_data.$O: \
     $(SRC_DIR)/ortools/lp_data/lp_print_utils.h \
     $(SRC_DIR)/ortools/lp_data/lp_utils.h \
     $(SRC_DIR)/ortools/lp_data/matrix_utils.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/join.h \
     $(SRC_DIR)/ortools/base/logging.h \
     $(SRC_DIR)/ortools/base/stringprintf.h
@@ -749,7 +742,6 @@ GLOP_DEPS = \
     $(SRC_DIR)/ortools/base/casts.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
     $(SRC_DIR)/ortools/base/file.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/int_type.h \
     $(SRC_DIR)/ortools/base/join.h \
@@ -961,6 +953,7 @@ $(OBJ_DIR)/glop/lp_solver.$O: \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/join.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h \
     $(SRC_DIR)/ortools/base/strutil.h \
     $(SRC_DIR)/ortools/base/timer.h \
     $(SRC_DIR)/ortools/lp_data/lp_types.h \
@@ -1067,7 +1060,6 @@ GRAPH_DEPS = \
     $(SRC_DIR)/ortools/base/casts.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
     $(SRC_DIR)/ortools/base/file.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/int_type.h \
     $(SRC_DIR)/ortools/base/join.h \
@@ -1104,7 +1096,6 @@ $(SRC_DIR)/ortools/graph/christofides.h: \
     $(SRC_DIR)/ortools/base/logging.h
 
 $(SRC_DIR)/ortools/graph/cliques.h: \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/int_type.h \
     $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \
     $(SRC_DIR)/ortools/base/join.h \
@@ -1218,7 +1209,6 @@ $(OBJ_DIR)/graph/astar.$O: \
     $(SRC_DIR)/ortools/graph/astar.cc \
     $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \
     $(SRC_DIR)/ortools/base/callback.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sastar.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sastar.$O
 
@@ -1230,14 +1220,12 @@ $(OBJ_DIR)/graph/bellman_ford.$O: \
 $(OBJ_DIR)/graph/cliques.$O: \
     $(SRC_DIR)/ortools/graph/cliques.cc \
     $(SRC_DIR)/ortools/graph/cliques.h \
-    $(SRC_DIR)/ortools/base/callback.h \
     $(SRC_DIR)/ortools/base/hash.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Scliques.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Scliques.$O
 
 $(OBJ_DIR)/graph/dijkstra.$O: \
     $(SRC_DIR)/ortools/graph/dijkstra.cc \
     $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sdijkstra.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sdijkstra.$O
 
@@ -1267,10 +1255,8 @@ $(OBJ_DIR)/graph/min_cost_flow.$O: \
 $(OBJ_DIR)/graph/shortestpaths.$O: \
     $(SRC_DIR)/ortools/graph/shortestpaths.cc \
     $(SRC_DIR)/ortools/graph/shortestpaths.h \
-    $(SRC_DIR)/ortools/base/callback.h \
     $(SRC_DIR)/ortools/base/casts.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/logging.h \
     $(SRC_DIR)/ortools/base/macros.h
@@ -1298,7 +1284,6 @@ ALGORITHMS_DEPS = \
     $(SRC_DIR)/ortools/base/casts.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
     $(SRC_DIR)/ortools/base/file.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/int_type.h \
     $(SRC_DIR)/ortools/base/join.h \
@@ -1348,9 +1333,6 @@ $(SRC_DIR)/ortools/algorithms/find_graph_symmetries.h: \
     $(SRC_DIR)/ortools/util/time_limit.h \
     $(SRC_DIR)/ortools/graph/graph.h
 
-$(SRC_DIR)/ortools/algorithms/hungarian.h: \
-    $(SRC_DIR)/ortools/base/hash.h
-
 $(SRC_DIR)/ortools/algorithms/knapsack_solver.h: \
     $(SRC_DIR)/ortools/base/basictypes.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
@@ -1397,7 +1379,6 @@ $(OBJ_DIR)/algorithms/hungarian.$O: \
 $(OBJ_DIR)/algorithms/hungarian_test.$O: \
     $(SRC_DIR)/ortools/algorithms/hungarian_test.cc \
     $(SRC_DIR)/ortools/algorithms/hungarian.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/macros.h \
     $(SRC_DIR)/ortools/base/map_util.h \
@@ -1443,7 +1424,6 @@ SAT_DEPS = \
     $(SRC_DIR)/ortools/base/casts.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
     $(SRC_DIR)/ortools/base/file.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/int_type.h \
     $(SRC_DIR)/ortools/base/join.h \
@@ -1667,7 +1647,6 @@ $(SRC_DIR)/ortools/sat/sat_solver.h: \
     $(SRC_DIR)/ortools/sat/pb_constraint.h \
     $(GEN_DIR)/ortools/sat/sat_parameters.pb.h \
     $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/int_type.h \
     $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \
@@ -1723,6 +1702,7 @@ $(OBJ_DIR)/sat/boolean_problem.$O: \
     $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/join.h \
     $(SRC_DIR)/ortools/base/map_util.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h \
     $(SRC_DIR)/ortools/algorithms/find_graph_symmetries.h \
     $(SRC_DIR)/ortools/graph/graph.h \
     $(SRC_DIR)/ortools/graph/io.h \
@@ -1760,13 +1740,15 @@ $(OBJ_DIR)/sat/cumulative.$O: \
 $(OBJ_DIR)/sat/disjunctive.$O: \
     $(SRC_DIR)/ortools/sat/disjunctive.cc \
     $(SRC_DIR)/ortools/sat/disjunctive.h \
-    $(SRC_DIR)/ortools/sat/sat_solver.h
+    $(SRC_DIR)/ortools/sat/sat_solver.h \
+    $(SRC_DIR)/ortools/base/iterator_adaptors.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sdisjunctive.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sdisjunctive.$O
 
 $(OBJ_DIR)/sat/drat.$O: \
     $(SRC_DIR)/ortools/sat/drat.cc \
     $(SRC_DIR)/ortools/sat/drat.h \
-    $(SRC_DIR)/ortools/base/commandlineflags.h
+    $(SRC_DIR)/ortools/base/commandlineflags.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sdrat.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sdrat.$O
 
 $(OBJ_DIR)/sat/encoding.$O: \
@@ -1782,6 +1764,7 @@ $(OBJ_DIR)/sat/flow_costs.$O: \
 $(OBJ_DIR)/sat/integer.$O: \
     $(SRC_DIR)/ortools/sat/integer.cc \
     $(SRC_DIR)/ortools/sat/integer.h \
+    $(SRC_DIR)/ortools/base/iterator_adaptors.h \
     $(SRC_DIR)/ortools/base/stl_util.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sinteger.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sinteger.$O
 
@@ -1822,7 +1805,8 @@ $(OBJ_DIR)/sat/optimization.$O: \
     $(SRC_DIR)/ortools/sat/optimization.cc \
     $(SRC_DIR)/ortools/sat/encoding.h \
     $(SRC_DIR)/ortools/sat/optimization.h \
-    $(SRC_DIR)/ortools/sat/util.h
+    $(SRC_DIR)/ortools/sat/util.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Soptimization.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Soptimization.$O
 
 $(OBJ_DIR)/sat/overload_checker.$O: \
@@ -1835,6 +1819,7 @@ $(OBJ_DIR)/sat/overload_checker.$O: \
 $(OBJ_DIR)/sat/pb_constraint.$O: \
     $(SRC_DIR)/ortools/sat/pb_constraint.cc \
     $(SRC_DIR)/ortools/sat/pb_constraint.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h \
     $(SRC_DIR)/ortools/base/thorough_hash.h \
     $(SRC_DIR)/ortools/util/saturated_arithmetic.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Spb_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Spb_constraint.$O
@@ -1854,6 +1839,7 @@ $(OBJ_DIR)/sat/sat_solver.$O: \
     $(SRC_DIR)/ortools/base/logging.h \
     $(SRC_DIR)/ortools/base/split.h \
     $(SRC_DIR)/ortools/base/stl_util.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h \
     $(SRC_DIR)/ortools/base/sysinfo.h \
     $(SRC_DIR)/ortools/util/saturated_arithmetic.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Ssat_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssat_solver.$O
@@ -1936,7 +1922,6 @@ BOP_DEPS = \
     $(SRC_DIR)/ortools/base/casts.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
     $(SRC_DIR)/ortools/base/file.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/int_type.h \
     $(SRC_DIR)/ortools/base/join.h \
@@ -2158,6 +2143,7 @@ $(OBJ_DIR)/bop/bop_ls.$O: \
     $(SRC_DIR)/ortools/bop/bop_ls.cc \
     $(SRC_DIR)/ortools/bop/bop_ls.h \
     $(SRC_DIR)/ortools/bop/bop_util.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h \
     $(SRC_DIR)/ortools/sat/boolean_problem.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_ls.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_ls.$O
 
@@ -2170,6 +2156,7 @@ $(OBJ_DIR)/bop/bop_portfolio.$O: \
     $(SRC_DIR)/ortools/bop/bop_util.h \
     $(SRC_DIR)/ortools/bop/complete_optimizer.h \
     $(SRC_DIR)/ortools/base/stl_util.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h \
     $(SRC_DIR)/ortools/sat/boolean_problem.h \
     $(SRC_DIR)/ortools/sat/symmetry.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_portfolio.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_portfolio.$O
@@ -2243,7 +2230,6 @@ LP_DEPS = \
     $(SRC_DIR)/ortools/base/casts.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
     $(SRC_DIR)/ortools/base/file.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/int_type.h \
     $(SRC_DIR)/ortools/base/join.h \
@@ -2308,7 +2294,6 @@ $(SRC_DIR)/ortools/linear_solver/glop_utils.h: \
 $(SRC_DIR)/ortools/linear_solver/linear_solver.h: \
     $(SRC_DIR)/ortools/linear_solver/linear_expr.h \
     $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/logging.h \
     $(SRC_DIR)/ortools/base/timer.h \
@@ -2403,7 +2388,6 @@ $(OBJ_DIR)/linear_solver/gurobi_interface.$O: \
     $(SRC_DIR)/ortools/linear_solver/gurobi_interface.cc \
     $(SRC_DIR)/ortools/linear_solver/linear_solver.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/logging.h \
     $(SRC_DIR)/ortools/base/map_util.h \
@@ -2492,7 +2476,6 @@ CP_DEPS = \
     $(SRC_DIR)/ortools/base/casts.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
     $(SRC_DIR)/ortools/base/file.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/int_type.h \
     $(SRC_DIR)/ortools/base/join.h \
@@ -2691,6 +2674,7 @@ $(OBJ_DIR)/constraint_solver/alldiff_cst.$O: \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/logging.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h \
     $(SRC_DIR)/ortools/util/string_array.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Salldiff_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Salldiff_cst.$O
 
@@ -2712,7 +2696,6 @@ $(OBJ_DIR)/constraint_solver/collect_variables.$O: \
     $(SRC_DIR)/ortools/constraint_solver/collect_variables.cc \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/logging.h \
     $(SRC_DIR)/ortools/base/macros.h \
@@ -2726,6 +2709,7 @@ $(OBJ_DIR)/constraint_solver/constraints.$O: \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/join.h \
     $(SRC_DIR)/ortools/base/logging.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h \
     $(SRC_DIR)/ortools/util/saturated_arithmetic.h \
     $(SRC_DIR)/ortools/util/string_array.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sconstraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sconstraints.$O
@@ -2764,12 +2748,12 @@ $(OBJ_DIR)/constraint_solver/default_search.$O: \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/logging.h \
     $(SRC_DIR)/ortools/base/macros.h \
     $(SRC_DIR)/ortools/base/random.h \
     $(SRC_DIR)/ortools/base/stl_util.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h \
     $(SRC_DIR)/ortools/util/cached_log.h \
     $(SRC_DIR)/ortools/util/string_array.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sdefault_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdefault_search.$O
@@ -2856,7 +2840,6 @@ $(OBJ_DIR)/constraint_solver/expressions.$O: \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/join.h \
     $(SRC_DIR)/ortools/base/logging.h \
@@ -2892,6 +2875,7 @@ $(OBJ_DIR)/constraint_solver/graph_constraints.$O: \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/join.h \
     $(SRC_DIR)/ortools/base/logging.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h \
     $(SRC_DIR)/ortools/util/saturated_arithmetic.h \
     $(SRC_DIR)/ortools/util/string_array.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sgraph_constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sgraph_constraints.$O
@@ -2903,7 +2887,6 @@ $(OBJ_DIR)/constraint_solver/hybrid.$O: \
     $(SRC_DIR)/ortools/constraint_solver/hybrid.h \
     $(SRC_DIR)/ortools/base/callback.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/macros.h \
     $(SRC_DIR)/ortools/base/stl_util.h \
@@ -2952,6 +2935,7 @@ $(OBJ_DIR)/constraint_solver/local_search.$O: \
     $(SRC_DIR)/ortools/base/macros.h \
     $(SRC_DIR)/ortools/base/map_util.h \
     $(SRC_DIR)/ortools/base/random.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h \
     $(SRC_DIR)/ortools/util/saturated_arithmetic.h \
     $(SRC_DIR)/ortools/graph/hamiltonian_path.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Slocal_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Slocal_search.$O
@@ -2991,7 +2975,8 @@ $(OBJ_DIR)/constraint_solver/range_cst.$O: \
     $(SRC_DIR)/ortools/constraint_solver/range_cst.cc \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \
-    $(SRC_DIR)/ortools/base/logging.h
+    $(SRC_DIR)/ortools/base/logging.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srange_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srange_cst.$O
 
 $(OBJ_DIR)/constraint_solver/resource.$O: \
@@ -2999,7 +2984,6 @@ $(OBJ_DIR)/constraint_solver/resource.$O: \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/join.h \
     $(SRC_DIR)/ortools/base/logging.h \
@@ -3028,6 +3012,7 @@ $(OBJ_DIR)/constraint_solver/routing.$O: \
     $(SRC_DIR)/ortools/base/logging.h \
     $(SRC_DIR)/ortools/base/map_util.h \
     $(SRC_DIR)/ortools/base/stl_util.h \
+    $(SRC_DIR)/ortools/base/stringprintf.h \
     $(SRC_DIR)/ortools/base/thorough_hash.h \
     $(SRC_DIR)/ortools/util/saturated_arithmetic.h \
     $(SRC_DIR)/ortools/graph/connectivity.h \
@@ -3099,7 +3084,6 @@ $(OBJ_DIR)/constraint_solver/search.$O: \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \
     $(GEN_DIR)/ortools/constraint_solver/search_limit.pb.h \
     $(SRC_DIR)/ortools/base/bitmap.h \
-    $(SRC_DIR)/ortools/base/casts.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
     $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
@@ -3129,7 +3113,6 @@ $(OBJ_DIR)/constraint_solver/table.$O: \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \
     $(SRC_DIR)/ortools/constraint_solver/sat_constraint.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/join.h \
     $(SRC_DIR)/ortools/base/logging.h \
@@ -3155,7 +3138,6 @@ $(OBJ_DIR)/constraint_solver/trace.$O: \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \
     $(SRC_DIR)/ortools/base/commandlineflags.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/join.h \
     $(SRC_DIR)/ortools/base/logging.h \
@@ -3194,7 +3176,6 @@ $(OBJ_DIR)/constraint_solver/visitor.$O: \
     $(SRC_DIR)/ortools/constraint_solver/visitor.cc \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \
     $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \
-    $(SRC_DIR)/ortools/base/hash.h \
     $(SRC_DIR)/ortools/base/integral_types.h \
     $(SRC_DIR)/ortools/base/logging.h \
     $(SRC_DIR)/ortools/base/macros.h \
@@ -3260,3 +3241,4 @@ $(GEN_DIR)/ortools/constraint_solver/solver_parameters.pb.h: $(GEN_DIR)/ortools/
 
 $(OBJ_DIR)/constraint_solver/solver_parameters.pb.$O: $(GEN_DIR)/ortools/constraint_solver/solver_parameters.pb.cc
 	$(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/constraint_solver/solver_parameters.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssolver_parameters.pb.$O
+
diff --git a/ortools/constraint_solver/csharp/routing.i b/ortools/constraint_solver/csharp/routing.i
index e09ed11b5d..af2beaebc4 100644
--- a/ortools/constraint_solver/csharp/routing.i
+++ b/ortools/constraint_solver/csharp/routing.i
@@ -11,7 +11,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 // TODO(user): Refactor this file to adhere to the SWIG style guide.
 %include "ortools/constraint_solver/csharp/constraint_solver.i"
 
diff --git a/ortools/graph/util.h b/ortools/graph/util.h
index d68ae304c5..c3050349dc 100644
--- a/ortools/graph/util.h
+++ b/ortools/graph/util.h
@@ -231,7 +231,7 @@ void RemoveCyclesFromPath(const Graph& graph, std::vector<int>* arc_path) {
   if (arc_path->empty()) return;
 
   // This maps each node to the latest arc in the given path that leaves it.
-  std::unordered_map<int, int> last_arc_leaving_node;
+  std::map<int, int> last_arc_leaving_node;
   for (const int arc : *arc_path) last_arc_leaving_node[graph.Tail(arc)] = arc;
 
   // Special case for the destination.
diff --git a/ortools/linear_solver/linear_expr.cc b/ortools/linear_solver/linear_expr.cc
index f0fc3716a6..b4258af9b7 100644
--- a/ortools/linear_solver/linear_expr.cc
+++ b/ortools/linear_solver/linear_expr.cc
@@ -19,9 +19,8 @@
 
 namespace operations_research {
 
+LinearExpr::LinearExpr(double constant) : offset_(constant), terms_() {}
 
-LinearExpr::LinearExpr(double constant) : offset_(constant), terms_() {
-}
 LinearExpr::LinearExpr() : LinearExpr(0.0) {}
 
 LinearExpr::LinearExpr(const MPVariable* var) : LinearExpr(0.0) {
diff --git a/ortools/linear_solver/linear_expr.h b/ortools/linear_solver/linear_expr.h
index ac065522d1..610296a67a 100644
--- a/ortools/linear_solver/linear_expr.h
+++ b/ortools/linear_solver/linear_expr.h
@@ -119,8 +119,8 @@ class LinearExpr {
 
   double offset() const { return offset_; }
   const std::unordered_map<const MPVariable*, double>& terms() const {
-      return terms_;
-    }
+    return terms_;
+  }
 
  private:
   double offset_;
diff --git a/ortools/lp_data/lp_data.h b/ortools/lp_data/lp_data.h
index 61e2715e09..2c6dd6ed6a 100644
--- a/ortools/lp_data/lp_data.h
+++ b/ortools/lp_data/lp_data.h
@@ -26,6 +26,7 @@
 
 #include <algorithm>  // for max
 #include <unordered_map>
+#include <unordered_set>
 #include <map>
 #include <string>  // for std::string
 #include <vector>  // for vector
diff --git a/ortools/lp_data/mps_reader.h b/ortools/lp_data/mps_reader.h
index 273de2930a..187d234dcc 100644
--- a/ortools/lp_data/mps_reader.h
+++ b/ortools/lp_data/mps_reader.h
@@ -27,7 +27,6 @@
 
 #include <algorithm>  // for max
 #include <unordered_map>
-#include <unordered_set>
 #include <string>  // for std::string
 #include <vector>  // for vector
 
diff --git a/ortools/sat/disjunctive.cc b/ortools/sat/disjunctive.cc
index 1119f0fc82..3208ab56c0 100644
--- a/ortools/sat/disjunctive.cc
+++ b/ortools/sat/disjunctive.cc
@@ -13,6 +13,7 @@
 
 #include "ortools/sat/disjunctive.h"
 
+#include "ortools/base/iterator_adaptors.h"
 #include "ortools/sat/sat_solver.h"
 
 namespace operations_research {
@@ -220,9 +221,9 @@ bool DisjunctiveOverloadChecker::Propagate() {
   theta_tree_.Reset(start_event_time_, start_event_duration_);
 
   // Overload checker loop.
-  for (auto it = helper_->TaskByDecreasingEndMax().rbegin();
-       it != helper_->TaskByDecreasingEndMax().rend(); ++it) {
-    const auto& task_time = *it;
+  const auto& task_by_increasing_max_end =
+      ::gtl::reversed_view(helper_->TaskByDecreasingEndMax());
+  for (const auto task_time : task_by_increasing_max_end) {
     const int current_task = task_time.task_index;
     if (task_to_start_event_[current_task] == -1) {
       continue;
@@ -457,9 +458,9 @@ bool DisjunctiveNotLast::Propagate() {
   int queue_index = num_tasks - 1;
 
   task_set_.Clear();
-  for (auto it = helper_->TaskByDecreasingEndMax().rbegin();
-         it != helper_->TaskByDecreasingEndMax().rend(); ++it) {
-      const auto& task_time = *it;
+  const auto& task_by_increasing_max_end =
+      ::gtl::reversed_view(helper_->TaskByDecreasingEndMax());
+  for (const auto task_time : task_by_increasing_max_end) {
     const int t = task_time.task_index;
     const IntegerValue max_end = task_time.time;
 
diff --git a/ortools/sat/integer.cc b/ortools/sat/integer.cc
index 98e5e20368..8a2e791251 100644
--- a/ortools/sat/integer.cc
+++ b/ortools/sat/integer.cc
@@ -13,6 +13,7 @@
 
 #include "ortools/sat/integer.h"
 
+#include "ortools/base/iterator_adaptors.h"
 #include "ortools/base/stl_util.h"
 
 namespace operations_research {
@@ -421,8 +422,7 @@ IntegerVariable IntegerTrail::AddIntegerVariable(
     // Copy for the negated variable.
     var_to_current_lb_interval_index_.Set(NegationOf(var),
                                           all_intervals_.size());
-    for (int i = domain.size() - 1; i >= 0; --i) {
-            const ClosedInterval interval = domain[i];
+    for (const ClosedInterval interval : ::gtl::reversed_view(domain)) {
       all_intervals_.push_back({-interval.end, -interval.start});
     }
     InsertOrDie(&var_to_end_interval_index_, NegationOf(var),