diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2016-07-13 13:47:51 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2016-07-13 13:48:40 -0700 |
| commit | 9086d9643903c608ab015b0b7d903547a4e7b6f3 (patch) | |
| tree | b47053ab6f6bde20b55c4fff4019c68a7c45545c /src/google/protobuf/message.cc | |
| parent | 70c1ac756d3cd8fa04725f82f0ad1a30404c3bb3 (diff) | |
Integrate from internal code base.
Diffstat (limited to 'src/google/protobuf/message.cc')
| -rw-r--r-- | src/google/protobuf/message.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc index d62ca79c..f18077dd 100644 --- a/src/google/protobuf/message.cc +++ b/src/google/protobuf/message.cc @@ -62,8 +62,6 @@ namespace protobuf { using internal::WireFormat; using internal::ReflectionOps; -Message::~Message() {} - void Message::MergeFrom(const Message& from) { const Descriptor* descriptor = GetDescriptor(); GOOGLE_CHECK_EQ(from.GetDescriptor(), descriptor) |