| Index: third_party/protobuf/src/google/protobuf/any.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/any.cc b/third_party/protobuf/src/google/protobuf/any.cc
|
| index f7b1d310614cb6b5f4f3943ad2454327323d3a9e..83edba5788ad786e73d73c3a1c7a90e9b276e0e2 100644
|
| --- a/third_party/protobuf/src/google/protobuf/any.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/any.cc
|
| @@ -30,6 +30,8 @@
|
|
|
| #include <google/protobuf/any.h>
|
|
|
| +#include <google/protobuf/generated_message_util.h>
|
| +
|
| namespace google {
|
| namespace protobuf {
|
| namespace internal {
|
| @@ -70,13 +72,11 @@ bool AnyMetadata::UnpackTo(Message* message) const {
|
| if (!InternalIs(message->GetDescriptor())) {
|
| return false;
|
| }
|
| - return message->ParseFromString(
|
| - value_->GetNoArena(&::google::protobuf::internal::GetEmptyString()));
|
| + return message->ParseFromString(value_->GetNoArena());
|
| }
|
|
|
| bool AnyMetadata::InternalIs(const Descriptor* descriptor) const {
|
| - const string type_url = type_url_->GetNoArena(
|
| - &::google::protobuf::internal::GetEmptyString());
|
| + const string type_url = type_url_->GetNoArena();
|
| string full_name;
|
| if (!ParseAnyTypeUrl(type_url, &full_name)) {
|
| return false;
|
|
|