diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-11 15:38:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-11 15:38:15 -0400 |
| commit | 6273647250410f2df9f78d57d2bfccad02b0d419 (patch) | |
| tree | 79b5082f572e1e24d2ace92aa38bfe8acb492ebc /googlemock | |
| parent | b4429c9219ef64cc7dbd833a53efa3cfc3864524 (diff) | |
| parent | af4cfd50889567586c45c87af304c53367d825c0 (diff) | |
| download | googletest-6273647250410f2df9f78d57d2bfccad02b0d419.tar.gz googletest-6273647250410f2df9f78d57d2bfccad02b0d419.tar.bz2 googletest-6273647250410f2df9f78d57d2bfccad02b0d419.zip | |
Merge pull request #1560 from gennadiycivil/master
Upstream cl/192179348
Diffstat (limited to 'googlemock')
| -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 0ac3b299..fcb45acd 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"; } |