eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1560 from gennadiycivil/master

Browse Source 
Upstream cl/192179348
This commit is contained in:
Gennadiy Civil 2018-04-11 15:38:15 -04:00 committed by GitHub
commit 6979a13236
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
googlemock/include/gmock/gmock-matchers.h
View File

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