aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Josh Haberman <jhaberman@gmail.com>2016-04-07 14:26:59 -0700
committerGravatar Josh Haberman <jhaberman@gmail.com>2016-04-07 14:26:59 -0700
commit2cd79bf3a8fd09c1df3dbc92a279a91a75896035 (patch)
treee1b61d1161d490dcfe27a4c22a6e72662af9e6a5 /src
parent4465daa57a4b6910965e9d078ae125ddb9ee8c21 (diff)
Removed duplicated operator delete from merge conflict.
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/dynamic_message.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/google/protobuf/dynamic_message.cc b/src/google/protobuf/dynamic_message.cc
index 6792dc0d..9e83bd29 100644
--- a/src/google/protobuf/dynamic_message.cc
+++ b/src/google/protobuf/dynamic_message.cc
@@ -253,12 +253,6 @@ 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();