diff options
| author | Arkadiy Shapkin <arkady.shapkin@gmail.com> | 2017-05-03 10:40:33 (GMT) |
|---|---|---|
| committer | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-10-25 13:04:01 (GMT) |
| commit | 2641b021fc2ab12896cf868d90f19936ef4b4696 (patch) | |
| tree | 94f1a3f223b38d4830d639f8b892378ff8c69443 /googlemock/test/gmock-matchers_test.cc | |
| parent | 77380cddf77133b98a16b5427ac732648233de29 (diff) | |
| download | googletest-2641b021fc2ab12896cf868d90f19936ef4b4696.zip googletest-2641b021fc2ab12896cf868d90f19936ef4b4696.tar.gz googletest-2641b021fc2ab12896cf868d90f19936ef4b4696.tar.bz2 | |
Fix tests with VS2015 and VS2017
Diffstat (limited to 'googlemock/test/gmock-matchers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index fc86748..207c6fd 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -58,6 +58,11 @@ # include <forward_list> // NOLINT #endif +// Disable MSVC2015 warning for std::pair: "decorated name length exceeded, name was truncated". +#if defined(_MSC_VER) && (_MSC_VER == 1900) +# pragma warning(disable:4503) +#endif + namespace testing { namespace internal { |