diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-12 11:32:17 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-12 11:32:17 -0400 |
| commit | c67f51b5dc1a7e2b614d50b60061bb143be71d45 (patch) | |
| tree | 22df7543be52bc1dc9fc503d81418f44aec86c09 /googlemock | |
| parent | 9b5940e040c9e0f45bb3dfe3ab457d1e6ec022b0 (diff) | |
| download | googletest-c67f51b5dc1a7e2b614d50b60061bb143be71d45.tar.gz googletest-c67f51b5dc1a7e2b614d50b60061bb143be71d45.tar.bz2 googletest-c67f51b5dc1a7e2b614d50b60061bb143be71d45.zip | |
msvc
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index 3162a05e..16116b5c 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -61,7 +61,7 @@ // Disable MSVC2015 warning for std::pair: // "decorated name length exceeded, name was truncated". -#if defined(_MSC_VER) && (_MSC_VER <= 1900) +#if defined _MSC_VER # pragma warning(push) # pragma warning(disable:4503) #endif @@ -6696,7 +6696,7 @@ TEST(NotTest, WorksOnMoveOnlyType) { } // namespace gmock_matchers_test } // namespace testing -#if defined(_MSC_VER) && (_MSC_VER <= 1900) +#if defined_MSC_VER # pragma warning(pop) #endif |