Skip to content

GitLab

Unverified Commit 62736472 authored by Gennadiy Civil's avatar Gennadiy Civil Committed by GitHub
Browse files

Merge pull request #1560 from gennadiycivil/master 

Upstream cl/192179348
parents b4429c92 af4cfd50
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
googlemock/include/gmock/gmock-matchers.h
View file @ 62736472
...@@ -4140,7 +4140,8 @@ class VariantMatcher { ...@@ -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 { ...@@ -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";
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment