diff options
| author |  Adam Cozzette <acozzette@google.com> | 2016-06-29 15:23:27 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2016-06-29 15:38:03 -0700 |
| commit | d64a2d9941c36a7bc2a7959ea10ab8363192ac14 (patch) | |
| tree | 52330d146ad63d3d70f3baade00d5d1fea8f5e0c /src/google/protobuf/generated_message_reflection.cc | |
| parent | c18aa7795a2e02ef700ff8b039d94ecdcc33432f (diff) | |
Integrated internal changes from Google
This includes all internal changes from around May 20 to now.
Diffstat (limited to 'src/google/protobuf/generated_message_reflection.cc')
| -rw-r--r-- | src/google/protobuf/generated_message_reflection.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc index 2313181c..347bac5a 100644 --- a/src/google/protobuf/generated_message_reflection.cc +++ b/src/google/protobuf/generated_message_reflection.cc @@ -1579,7 +1579,8 @@ Message* GeneratedMessageReflection::UnsafeArenaReleaseMessage( if (field->is_extension()) { return static_cast<Message*>( - MutableExtensionSet(message)->ReleaseMessage(field, factory)); + MutableExtensionSet(message)->UnsafeArenaReleaseMessage(field, + factory)); } else { ClearBit(message, field); if (field->containing_oneof()) { |