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
This commit is contained in:
parent
0e0d9feefa
commit
0f6885405c
@ -290,13 +290,6 @@ class WithoutMatchers {
|
|||||||
// Internal use only: access the singleton instance of WithoutMatchers.
|
// Internal use only: access the singleton instance of WithoutMatchers.
|
||||||
GTEST_API_ WithoutMatchers GetWithoutMatchers();
|
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
|
// 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
|
// 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
|
// when a value of type T is needed for compilation, but the statement
|
||||||
@ -314,10 +307,6 @@ inline T Invalid() {
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Given a raw type (i.e. having no top-level reference or const
|
// Given a raw type (i.e. having no top-level reference or const
|
||||||
// modifier) RawContainer that's either an STL-style container or a
|
// modifier) RawContainer that's either an STL-style container or a
|
||||||
// native array, class StlContainerView<RawContainer> has the
|
// native array, class StlContainerView<RawContainer> has the
|
||||||
|
Loading…
Reference in New Issue
Block a user