diff options
| author | Arkadiy Shapkin <arkady.shapkin@gmail.com> | 2017-05-03 13:40:33 +0300 |
|---|---|---|
| committer | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-10-25 16:04:01 +0300 |
| commit | 2641b021fc2ab12896cf868d90f19936ef4b4696 (patch) | |
| tree | 94f1a3f223b38d4830d639f8b892378ff8c69443 /googlemock | |
| parent | 77380cddf77133b98a16b5427ac732648233de29 (diff) | |
| download | googletest-2641b021fc2ab12896cf868d90f19936ef4b4696.tar.gz googletest-2641b021fc2ab12896cf868d90f19936ef4b4696.tar.bz2 googletest-2641b021fc2ab12896cf868d90f19936ef4b4696.zip | |
Fix tests with VS2015 and VS2017
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/test/gmock-generated-matchers_test.cc | 8 | ||||
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/googlemock/test/gmock-generated-matchers_test.cc b/googlemock/test/gmock-generated-matchers_test.cc index 8234858d..6cba726d 100644 --- a/googlemock/test/gmock-generated-matchers_test.cc +++ b/googlemock/test/gmock-generated-matchers_test.cc @@ -120,7 +120,7 @@ TEST(ArgsTest, AcceptsOneTemplateArg) { } TEST(ArgsTest, AcceptsTwoTemplateArgs) { - const tuple<short, int, long> t(4, 5, 6L); // NOLINT + const tuple<short, int, long> t(static_cast<short>(4), 5, 6L); // NOLINT EXPECT_THAT(t, (Args<0, 1>(Lt()))); EXPECT_THAT(t, (Args<1, 2>(Lt()))); @@ -128,13 +128,13 @@ TEST(ArgsTest, AcceptsTwoTemplateArgs) { } TEST(ArgsTest, AcceptsRepeatedTemplateArgs) { - const tuple<short, int, long> t(4, 5, 6L); // NOLINT + const tuple<short, int, long> t(static_cast<short>(4), 5, 6L); // NOLINT EXPECT_THAT(t, (Args<0, 0>(Eq()))); EXPECT_THAT(t, Not(Args<1, 1>(Ne()))); } TEST(ArgsTest, AcceptsDecreasingTemplateArgs) { - const tuple<short, int, long> t(4, 5, 6L); // NOLINT + const tuple<short, int, long> t(static_cast<short>(4), 5, 6L); // NOLINT EXPECT_THAT(t, (Args<2, 0>(Gt()))); EXPECT_THAT(t, Not(Args<2, 1>(Lt()))); } @@ -159,7 +159,7 @@ TEST(ArgsTest, AcceptsMoreTemplateArgsThanArityOfOriginalTuple) { } TEST(ArgsTest, CanBeNested) { - const tuple<short, int, long, int> t(4, 5, 6L, 6); // NOLINT + const tuple<short, int, long, int> t(static_cast<short>(4), 5, 6L, 6); // NOLINT EXPECT_THAT(t, (Args<1, 2, 3>(Args<1, 2>(Eq())))); EXPECT_THAT(t, (Args<0, 1, 3>(Args<0, 2>(Lt())))); } diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index fc867487..207c6fdd 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 { |