AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Removed duplicated operator delete from merge conflict.

Browse Source
This commit is contained in:
Josh Haberman 2016-04-07 14:26:59 -07:00
parent 4465daa57a
commit 2cd79bf3a8
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/google/protobuf/dynamic_message.cc
View File

@ -253,12 +253,6 @@ class DynamicMessage : public Message {
DynamicMessage(const TypeInfo* type_info); DynamicMessage(const TypeInfo* type_info);
~DynamicMessage(); ~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. // Called on the prototype after construction to initialize message fields.
void CrossLinkPrototypes(); void CrossLinkPrototypes();