diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-06-24 14:30:33 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-06-24 14:56:58 -0700 |
| commit | 658e72d8fb7599d566e843070ec90f8d0c9141c5 (patch) | |
| tree | 8d93c5118b505de18393495e8e66ddd677af3ff4 /src/google/protobuf/util/message_differencer.h | |
| parent | 242fdef65a3eb681ce686c0a68c7d33d4fb2ea1a (diff) | |
fix compiler warnings.
- control reaches end of non-void function.
- remove a deprecated IsMatch.
Change-Id: Ifdeb15879bbcf591c48dc7fda1cd8994bdf87bb3
Diffstat (limited to 'src/google/protobuf/util/message_differencer.h')
| -rw-r--r-- | src/google/protobuf/util/message_differencer.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/google/protobuf/util/message_differencer.h b/src/google/protobuf/util/message_differencer.h index 05548897..e002a0f3 100644 --- a/src/google/protobuf/util/message_differencer.h +++ b/src/google/protobuf/util/message_differencer.h @@ -289,20 +289,11 @@ class LIBPROTOBUF_EXPORT MessageDifferencer { MapKeyComparator(); virtual ~MapKeyComparator(); - // The first IsMatch without parent_fields is only for backward - // compatibility. New users should override the second one instead. - // - // Deprecated. - // TODO(ykzhu): remove this function. - virtual bool IsMatch(const Message& message1, - const Message& message2) const { - GOOGLE_CHECK(false) << "This function shouldn't get called"; - return false; - } virtual bool IsMatch(const Message& message1, const Message& message2, const vector<SpecificField>& parent_fields) const { - return IsMatch(message1, message2); + GOOGLE_CHECK(false) << "IsMatch() is not implemented."; + return false; } private: |