minor sync

google · Oct 16, 2023 · 1ad4e80 · 1ad4e80
1 parent 7841ed4
commit 1ad4e80
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/ortools/port/file.h b/ortools/port/file.h
@@ -21,7 +21,6 @@
 
 namespace operations_research {
 
-// See ortools/base/helpers.h
 ::absl::Status PortableFileSetContents(absl::string_view file_name,
                                        absl::string_view content);
 

diff --git a/ortools/python/BUILD.bazel b/ortools/python/BUILD.bazel
@@ -37,4 +37,4 @@ py_binary(
         requirement("svgwrite"),
         requirement("plotly"),
     ],
-)
+)
diff --git a/ortools/sat/BUILD.bazel b/ortools/sat/BUILD.bazel
@@ -206,7 +206,7 @@ cc_library(
         "//ortools/algorithms:binary_search",
         "//ortools/util:sorted_interval_list",
         "@com_google_absl//absl/functional:bind_front",
-	"@com_google_absl//absl/log",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/random",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",

diff --git a/ortools/util/fp_utils.h b/ortools/util/fp_utils.h
@@ -170,7 +170,6 @@ inline bool IsIntegerWithinTolerance(FloatType x, FloatType tolerance) {
 
 // Handy alternatives to EXPECT_NEAR(), using relative and absolute tolerance
 // instead of relative tolerance only, and with a proper support for infinity.
-// TODO(user): investigate moving this to ortools/base/ or some other place.
 #define EXPECT_COMPARABLE(expected, obtained, epsilon)                    \
   EXPECT_TRUE(operations_research::AreWithinAbsoluteOrRelativeTolerances( \
       expected, obtained, epsilon, epsilon))                              \
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,4 +37,4 @@ py_binary( @@
             requirement("svgwrite"),
             requirement("plotly"),
         ],
-    )
+    )