msvc
This commit is contained in:
parent
b00e281078
commit
a0fd742639
|
@ -33,11 +33,13 @@
|
||||||
//
|
//
|
||||||
// This file tests some commonly used argument matchers.
|
// This file tests some commonly used argument matchers.
|
||||||
|
|
||||||
// Disable MSVC2015 warning for std::pair:
|
// Disable MSVC2014 warning for std::pair:
|
||||||
// "decorated name length exceeded, name was truncated".
|
// "decorated name length exceeded, name was truncated".
|
||||||
#ifdef _MSC_VER
|
ifdef _MSC_VER
|
||||||
# pragma warning(push)
|
#if _MSC_VER < 1900
|
||||||
# pragma warning(disable:4503)
|
# pragma warning(push)
|
||||||
|
# pragma warning(disable:4503)
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "gmock/gmock-matchers.h"
|
#include "gmock/gmock-matchers.h"
|
||||||
|
@ -6735,7 +6737,3 @@ TEST(NotTest, WorksOnMoveOnlyType) {
|
||||||
|
|
||||||
} // namespace gmock_matchers_test
|
} // namespace gmock_matchers_test
|
||||||
} // namespace testing
|
} // namespace testing
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
# pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user