diff options
| author |  Bo Yang <teboring@google.com> | 2015-09-15 18:25:02 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-10-04 13:22:54 -0700 |
| commit | 7c14dc837b2fcd61ed244ced90debeb4b42d1119 (patch) | |
| tree | ebaea9d0a20b315f4f372136200494d4aff3936c /src/google/protobuf/map.h | |
| parent | fbabf987e671aa37d11e1163e0175f99b32df5fe (diff) | |
Down-integrate internal bug fixing changes.
Diffstat (limited to 'src/google/protobuf/map.h')
| -rw-r--r-- | src/google/protobuf/map.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h index 8b61573d..72a1b1a3 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -190,6 +190,8 @@ class LIBPROTOBUF_EXPORT MapKey { GOOGLE_LOG(FATAL) << "Can't get here."; return false; } + GOOGLE_LOG(FATAL) << "Can't get here."; + return false; } void CopyFrom(const MapKey& other) { @@ -852,6 +854,8 @@ struct hash<google::protobuf::MapKey> { GOOGLE_LOG(FATAL) << "Can't get here."; return 0; } + GOOGLE_LOG(FATAL) << "Can't get here."; + return 0; } bool operator()(const google::protobuf::MapKey& map_key1, @@ -875,6 +879,8 @@ struct hash<google::protobuf::MapKey> { GOOGLE_LOG(FATAL) << "Can't get here."; return true; } + GOOGLE_LOG(FATAL) << "Can't get here."; + return true; } }; GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_END |