summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2022-09-08 16:41:57 (GMT)
committerCopybara-Service <copybara-worker@google.com>2022-09-08 16:42:31 (GMT)
commit0f6885405c980d5479d6177f7223d4bc7bacca6b (patch)
treeca2a9ca846aee2fb18f5898c44a10dd1c90c6565 /googlemock
parent0e0d9feefab1b51aaab9dfd70132e93c0b6964e5 (diff)
downloadgoogletest-0f6885405c980d5479d6177f7223d4bc7bacca6b.zip
googletest-0f6885405c980d5479d6177f7223d4bc7bacca6b.tar.gz
googletest-0f6885405c980d5479d6177f7223d4bc7bacca6b.tar.bz2
Remove obsolete MSVC warning pragmas for Invalid<T>()
Remove the MSVC pragmas for disabling warning C4717 (infinite recursion) for Invalid<T>() because that warning has been fixed in cl/441474979. PiperOrigin-RevId: 473012585 Change-Id: I5f1bf88379bd4f2bf005e029c04766ac4caadd84
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/include/gmock/internal/gmock-internal-utils.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h
index b1343fd..92d8eb9 100644
--- a/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ b/googlemock/include/gmock/internal/gmock-internal-utils.h
@@ -290,13 +290,6 @@ class WithoutMatchers {
// Internal use only: access the singleton instance of WithoutMatchers.
GTEST_API_ WithoutMatchers GetWithoutMatchers();
-// Disable MSVC warnings for infinite recursion, since in this case the
-// recursion is unreachable.
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4717)
-#endif
-
// Invalid<T>() is usable as an expression of type T, but will terminate
// the program with an assertion failure if actually run. This is useful
// when a value of type T is needed for compilation, but the statement
@@ -314,10 +307,6 @@ inline T Invalid() {
#endif
}
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
// Given a raw type (i.e. having no top-level reference or const
// modifier) RawContainer that's either an STL-style container or a
// native array, class StlContainerView<RawContainer> has the