Upstream cl/192179348

This commit is contained in:
Gennadiy Civil 2018-04-11 15:24:04 -04:00
parent 106e731e68
commit ab84d14281

View File

@ -4140,7 +4140,8 @@ class VariantMatcher {
private:
static std::string GetTypeName() {
#if GTEST_HAS_RTTI
return internal::GetTypeName<T>();
GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
return internal::GetTypeName<T>());
#endif
return "the element type";
}
@ -4200,7 +4201,8 @@ class AnyCastMatcher {
private:
static std::string GetTypeName() {
#if GTEST_HAS_RTTI
return internal::GetTypeName<T>();
GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
return internal::GetTypeName<T>());
#endif
return "the element type";
}