diff options
author | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-10 18:54:03 +0000 |
---|---|---|
committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-10 18:54:03 +0000 |
commit | 5e6539205e6810d0ee3d5a7fa7394deece92705d (patch) | |
tree | 902d0ea9368f35e977f427d437dc71981a9d8f6c | |
parent | a655b98171bd4956eeabcd744f9772997a36472b (diff) | |
download | protobuf-5e6539205e6810d0ee3d5a7fa7394deece92705d.tar.gz protobuf-5e6539205e6810d0ee3d5a7fa7394deece92705d.tar.bz2 protobuf-5e6539205e6810d0ee3d5a7fa7394deece92705d.zip |
Remove the customized operator delete.
-rw-r--r-- | src/google/protobuf/dynamic_message.cc | 8 |
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); |