google/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-11-11 07:11:29 -05:00
Code Issues Packages Projects 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
parent b4429c9219 af4cfd5088
commit 6273647250
1 changed files with 4 additions and 2 deletions
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:
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";
}