always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: update

Browse Source
This commit is contained in:
Corentin Le Molgat
2023-11-21 11:57:38 +01:00
parent 318419f19d
commit e3801a8526
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ortools/util/BUILD.bazel
View File

@@ -292,19 +292,17 @@ cc_library(
srcs = ["file_util.cc"],
hdrs = ["file_util.h"],
deps = [
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"//ortools/base",
"//ortools/base:dump_vars",
"//ortools/base:file",
"//ortools/base:gzipstring",
"//ortools/base:hash",
"//ortools/base:recordio",
"//ortools/base:status_macros",
"//ortools/base:gzipstring",
# "//net/proto2/io/public",
# "//net/proto2/io/public:io",
# "//net/proto2/public",
# "//net/proto2/util/public:json",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_protobuf//:protobuf",
],
)

6
ortools/util/file_util.cc
View File

@@ -168,7 +168,8 @@ absl::Status WriteProtoToFile(absl::string_view filename,
if (!google::protobuf::util::MessageToJsonString(proto, &output_string,
options)
.ok()) {
return make_error("Printing to stream failed.");
LOG(WARNING) << "Printing to stream failed.";
return make_error("google::protobuf::util::MessageToJsonString()");
}
file_type_suffix = ".json";
break;
@@ -179,7 +180,8 @@ absl::Status WriteProtoToFile(absl::string_view filename,
if (!google::protobuf::util::MessageToJsonString(proto, &output_string,
options)
.ok()) {
return make_error("Printing to stream failed.");
LOG(WARNING) << "Printing to stream failed.";
return make_error("google::protobuf::util::MessageToJsonString()");
}
file_type_suffix = ".json";
break;