diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-11 19:24:04 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-11 19:24:04 (GMT) |
| commit | ab84d14281889a59f16a5c04c14b911d8c79d288 (patch) | |
| tree | 79b5082f572e1e24d2ace92aa38bfe8acb492ebc /googlemock/include/gmock/gmock-matchers.h | |
| parent | 106e731e68a0900f8594735e258836e38ada6441 (diff) | |
| download | googletest-ab84d14281889a59f16a5c04c14b911d8c79d288.zip googletest-ab84d14281889a59f16a5c04c14b911d8c79d288.tar.gz googletest-ab84d14281889a59f16a5c04c14b911d8c79d288.tar.bz2 | |
Upstream cl/192179348
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 0ac3b29..fcb45ac 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -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"; } |