aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/dynamic_message.cc
diff options
context:
space:
mode:
authorGravatar liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2012-12-10 18:54:03 +0000
committerGravatar liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2012-12-10 18:54:03 +0000
commit5e6539205e6810d0ee3d5a7fa7394deece92705d (patch)
tree902d0ea9368f35e977f427d437dc71981a9d8f6c /src/google/protobuf/dynamic_message.cc
parenta655b98171bd4956eeabcd744f9772997a36472b (diff)
Remove the customized operator delete.
Diffstat (limited to 'src/google/protobuf/dynamic_message.cc')
-rw-r--r--src/google/protobuf/dynamic_message.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/google/protobuf/dynamic_message.cc b/src/google/protobuf/dynamic_message.cc
index e4bebb25..09bec543 100644
--- a/src/google/protobuf/dynamic_message.cc
+++ b/src/google/protobuf/dynamic_message.cc
@@ -208,14 +208,6 @@ class DynamicMessage : public Message {
Metadata GetMetadata() const;
- // We actually allocate more memory than sizeof(*this) when this
- // class's memory is allocated via the global operator new. Thus, we need to
- // manually call the global operator delete. Calling the destructor is taken
- // care of for us.
- static void operator delete(void* ptr) {
- ::operator delete(ptr);
- }
-
private:
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(DynamicMessage);