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