diff options
| author |  Josh Haberman <jhaberman@gmail.com> | 2016-04-07 14:10:19 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-04-07 14:10:19 -0700 |
| commit | 4465daa57a4b6910965e9d078ae125ddb9ee8c21 (patch) | |
| tree | e6d5096e6a2a5523d2b1975f6248cd9d8f8957ce /src/google/protobuf/dynamic_message.cc | |
| parent | 15239361e31d53c10b918aa9fe8ce057155588b4 (diff) | |
| parent | 09292d5759cbf3e82dcfae67e01ee31ed8906b5a (diff) | |
Merge branch 'master' into internal-merge
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 9e83bd29..6792dc0d 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(); |