Merge pull request #1560 from gennadiycivil/master

Upstream cl/192179348

Merge pull request #1560 from gennadiycivil/master
Upstream cl/192179348
62736472 · Gennadiy Civil · GitHub · b4429c92 · af4cfd50 · 62736472
Unverified Commit 62736472 authored Apr 11, 2018 by Gennadiy Civil Committed by GitHub Apr 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

googlemock/include/gmock/gmock-matchers.h googlemock/include/gmock/gmock-matchers.h +4 -2

No files found.
--- 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";
  }