diff --git a/examples/cpp/pdlp_solve.cc b/examples/cpp/pdlp_solve.cc index 85024fd0ff..0d32663d28 100644 --- a/examples/cpp/pdlp_solve.cc +++ b/examples/cpp/pdlp_solve.cc @@ -69,7 +69,7 @@ void WriteSolveLog(const std::string& solve_log_file, const SolveLog& log) { << solve_log_file << ". Expected .textproto, .pb, or .json"; } QCHECK(WriteProtoToFile(solve_log_file, log, write_format, /*gzipped=*/false, - /*append_extension_to_file_name=*/false)); + /*append_extension_to_file_name=*/false).ok()); } void Solve(const std::string& input, const std::string& params_str, diff --git a/patches/scip-v804.patch b/patches/scip-v804.patch new file mode 100644 index 0000000000..7a84f8b0b4 --- /dev/null +++ b/patches/scip-v804.patch @@ -0,0 +1,22 @@ +diff --git a/src/lpi/lpi_glop.cpp b/src/lpi/lpi_glop.cpp +index 2471778a8f..17fd1e8c34 100644 +--- a/src/lpi/lpi_glop.cpp ++++ b/src/lpi/lpi_glop.cpp +@@ -3190,7 +3190,7 @@ SCIP_RETCODE SCIPlpiReadLP( + + const std::string filespec(fname); + MPModelProto proto; +- if ( ! ReadFileToProto(filespec, &proto) ) ++ if ( ! ReadFileToProto(filespec, &proto).ok() ) + { + SCIPerrorMessage("Could not read <%s>\n", fname); + return SCIP_READERROR; +@@ -3214,7 +3214,7 @@ SCIP_RETCODE SCIPlpiWriteLP( + MPModelProto proto; + LinearProgramToMPModelProto(*lpi->linear_program, &proto); + const std::string filespec(fname); +- if ( ! WriteProtoToFile(filespec, proto, operations_research::ProtoWriteFormat::kProtoText, true) ) ++ if ( ! WriteProtoToFile(filespec, proto, operations_research::ProtoWriteFormat::kProtoText, true).ok() ) + { + SCIPerrorMessage("Could not write <%s>\n", fname); + return SCIP_READERROR;