aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/map.h
diff options
context:
space:
mode:
authorGravatar Paul Yang <TeBoring@users.noreply.github.com>2015-10-09 12:38:31 -0700
committerGravatar Paul Yang <TeBoring@users.noreply.github.com>2015-10-09 12:38:31 -0700
commit49f24afb45b7add17af3ed4493fa0a94d1cc64da (patch)
treeffeba17cd9db828e86bb7318018305e6b4336d58 /src/google/protobuf/map.h
parent693cb3d22a605d758cd7e020b4f4bddfbb5ca10c (diff)
parent7c14dc837b2fcd61ed244ced90debeb4b42d1119 (diff)
Merge pull request #815 from TeBoring/third-party
Use std::get where it's available
Diffstat (limited to 'src/google/protobuf/map.h')
-rw-r--r--src/google/protobuf/map.h6
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