fix

IspML · Aug 6, 2019 · 30c9420 · 30c9420
1 parent fb7d430
commit 30c9420
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
@@ -102,7 +102,7 @@ if(BUILD_Protobuf)
     REPOSITORY
       "https://github.com/protocolbuffers/protobuf.git"
     TAG
-      "v3.8.0"
+      "v3.9.0"
     CMAKE_ARGS
 	  -Dprotobuf_MSVC_STATIC_RUNTIME:BOOL=OFF
       "SOURCE_SUBDIR cmake"

diff --git a/ortools/linear_solver/linear_solver.h b/ortools/linear_solver/linear_solver.h
@@ -730,10 +730,8 @@ class MPSolver {
    * As of 2018-08-09, only Gurobi supports NextSolution(), see
    * linear_solver_underlying_gurobi_test for an example of how to configure
    * Gurobi for this purpose. The other solvers return false unconditionally.
-#if defined(USE_GUROBI)
    */
   ABSL_MUST_USE_RESULT bool NextSolution();
-#endif
 
   // DEPRECATED: Use TimeLimit() and SetTimeLimit(absl::Duration) instead.
   // NOTE: These deprecated functions used the convention time_limit = 0 to mean