diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-09-26 17:11:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-09-26 17:11:53 +0000 |
commit | 0daa514d395ea57a0783c3cbb4accb3662d209e0 (patch) | |
tree | 9f0692598992ef61742e2105d4462977afe12784 | |
parent | dc0b5de26265c76d50c575e574eda1385925eadb (diff) | |
parent | bbc8e2b10082ecb4301ded1a5b05e3687ad6156d (diff) | |
download | extras-0daa514d395ea57a0783c3cbb4accb3662d209e0.tar.gz |
Merge "Use message() instead of error_message()."
-rw-r--r-- | libjsonpb/parse/jsonpb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjsonpb/parse/jsonpb.cpp b/libjsonpb/parse/jsonpb.cpp index 3a042e71..e65a39d1 100644 --- a/libjsonpb/parse/jsonpb.cpp +++ b/libjsonpb/parse/jsonpb.cpp @@ -48,7 +48,7 @@ ErrorOr<std::string> MessageToJsonString(const Message& message) { &json, options); if (!status.ok()) { - return MakeError<std::string>(status.error_message().as_string()); + return MakeError<std::string>(status.message().as_string()); } return ErrorOr<std::string>(std::move(json)); } @@ -61,7 +61,7 @@ ErrorOr<std::monostate> JsonStringToMessage(const std::string& content, Message* std::string binary; auto status = JsonToBinaryString(resolver.get(), GetTypeUrl(*message), content, &binary); if (!status.ok()) { - return MakeError<std::monostate>(status.error_message().as_string()); + return MakeError<std::monostate>(status.message().as_string()); } if (!message->ParseFromString(binary)) { return MakeError<std::monostate>("Fail to parse."); |