diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-18 17:03:42 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-18 17:03:42 -0400 |
| commit | a0fd742639d87dcc442adf44c3800377a4547c37 (patch) | |
| tree | 7d397c9f30edc15a96a293826b097c59875b9c18 | |
| parent | b00e281078c3623b9022d8bf037a756f47eb7d21 (diff) | |
| download | googletest-a0fd742639d87dcc442adf44c3800377a4547c37.tar.gz googletest-a0fd742639d87dcc442adf44c3800377a4547c37.tar.bz2 googletest-a0fd742639d87dcc442adf44c3800377a4547c37.zip | |
msvc
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index 05c6eb6f..b8e27980 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -33,11 +33,13 @@ // // 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". -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable:4503) +ifdef _MSC_VER +#if _MSC_VER < 1900 +# pragma warning(push) +# pragma warning(disable:4503) +#endif #endif #include "gmock/gmock-matchers.h" @@ -6735,7 +6737,3 @@ TEST(NotTest, WorksOnMoveOnlyType) { } // namespace gmock_matchers_test } // namespace testing - -#ifdef _MSC_VER -# pragma warning(pop) -#endif |