Merge pull request #3504 from duianto:patch-1

PiperOrigin-RevId: 390486428
This commit is contained in:
Derek Mauro 2021-08-13 12:42:35 -04:00
commit 0134d73a49

View File

@ -279,7 +279,7 @@ class WithoutMatchers {
GTEST_API_ WithoutMatchers GetWithoutMatchers(); GTEST_API_ WithoutMatchers GetWithoutMatchers();
// Disable MSVC warnings for infinite recursion, since in this case the // Disable MSVC warnings for infinite recursion, since in this case the
// the recursion is unreachable. // recursion is unreachable.
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(push) # pragma warning(push)
# pragma warning(disable:4717) # pragma warning(disable:4717)