aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorBryan Zimmerman <BryanZim@bazinnovations.com>2017-12-11 12:19:56 -0500
committerBryan Zimmerman <BryanZim@bazinnovations.com>2017-12-11 12:19:56 -0500
commit3ea06317cd8b7e76596bdf84e591ae9414dc8d82 (patch)
tree10bc246611c54c94e400895c79b739e68d0d90ed /googlemock
parentf98c20baa82aad40c3295f3a8c052d079a5081ea (diff)
downloadgoogletest-3ea06317cd8b7e76596bdf84e591ae9414dc8d82.tar.gz
googletest-3ea06317cd8b7e76596bdf84e591ae9414dc8d82.tar.bz2
googletest-3ea06317cd8b7e76596bdf84e591ae9414dc8d82.zip
remove implicit casts
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/test/gmock-generated-matchers_test.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/googlemock/test/gmock-generated-matchers_test.cc b/googlemock/test/gmock-generated-matchers_test.cc
index 9eb4b258..6cba726d 100644
--- a/googlemock/test/gmock-generated-matchers_test.cc
+++ b/googlemock/test/gmock-generated-matchers_test.cc
@@ -64,7 +64,6 @@ using testing::ElementsAreArray;
using testing::Eq;
using testing::Ge;
using testing::Gt;
-using testing::internal::ImplicitCast_;
using testing::Le;
using testing::Lt;
using testing::MakeMatcher;
@@ -121,7 +120,7 @@ TEST(ArgsTest, AcceptsOneTemplateArg) {
}
TEST(ArgsTest, AcceptsTwoTemplateArgs) {
- const tuple<short, int, long> t(ImplicitCast_<short>(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())));
@@ -129,13 +128,13 @@ TEST(ArgsTest, AcceptsTwoTemplateArgs) {
}
TEST(ArgsTest, AcceptsRepeatedTemplateArgs) {
- const tuple<short, int, long> t(ImplicitCast_<short>(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(ImplicitCast_<short>(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())));
}
@@ -160,7 +159,7 @@ TEST(ArgsTest, AcceptsMoreTemplateArgsThanArityOfOriginalTuple) {
}
TEST(ArgsTest, CanBeNested) {
- const tuple<short, int, long, int> t(ImplicitCast_<short>(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()))));
}