From 5e6539205e6810d0ee3d5a7fa7394deece92705d Mon Sep 17 00:00:00 2001 From: "liujisi@google.com" Date: Mon, 10 Dec 2012 18:54:03 +0000 Subject: Remove the customized operator delete. --- src/google/protobuf/dynamic_message.cc | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/google/protobuf/dynamic_message.cc') 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); -- cgit v1.2.3