diff options
| author |  Jie Luo <anandolee@gmail.com> | 2016-04-07 11:05:05 -0700 |
|---|---|---|
| committer | Jie Luo <anandolee@gmail.com> | 2016-04-07 11:05:05 -0700 |
| commit | 09292d5759cbf3e82dcfae67e01ee31ed8906b5a (patch) | |
| tree | 557bf6298d995778375b9c7b53094c601b560211 /src/google/protobuf/dynamic_message.cc | |
| parent | cef46e115a3e1d23800eab70c0f704aba8bbfd96 (diff) | |
| parent | c61207492efa36244ffa16cc5b394e71888e4c0f (diff) | |
Merge pull request #1392 from anandolee/master
Sync the manually integrate changes in google3/third_party
Diffstat (limited to 'src/google/protobuf/dynamic_message.cc')
| -rw-r--r-- | src/google/protobuf/dynamic_message.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/google/protobuf/dynamic_message.cc b/src/google/protobuf/dynamic_message.cc index 8d689ac8..7b69867a 100644 --- a/src/google/protobuf/dynamic_message.cc +++ b/src/google/protobuf/dynamic_message.cc @@ -253,6 +253,12 @@ class DynamicMessage : public Message { DynamicMessage(const TypeInfo* type_info); ~DynamicMessage(); +#ifndef _MSC_VER + void operator delete(void *p) { + ::operator delete(p); // non-sized deallocation + } +#endif + // Called on the prototype after construction to initialize message fields. void CrossLinkPrototypes(); |