diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-10-25 10:33:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-25 10:33:54 -0400 |
| commit | 7684db32712ea4fdb56e8d6f784c51d6f39e5e2c (patch) | |
| tree | e8b98c51ad7fb8f9c55e6ca0f1c14f20a1567c45 /googlemock/test/gmock-generated-matchers_test.cc | |
| parent | 6d0bb75c81bc59770520e303f6a04737b8aedb39 (diff) | |
| parent | 840c711e7bd7240b3f451821473c759ad3578412 (diff) | |
| download | googletest-7684db32712ea4fdb56e8d6f784c51d6f39e5e2c.tar.gz googletest-7684db32712ea4fdb56e8d6f784c51d6f39e5e2c.tar.bz2 googletest-7684db32712ea4fdb56e8d6f784c51d6f39e5e2c.zip | |
Merge pull request #1218 from KindDragon/vs-build-fix
VS2015/2017 build fix and enable C++11 features (attempt number three)
Diffstat (limited to 'googlemock/test/gmock-generated-matchers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-generated-matchers_test.cc | 8 |
1 files changed, 4 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())))); } |