diff options
| author | Vadim Barkov <vbrkov@gmail.com> | 2018-10-28 03:27:51 +0300 |
|---|---|---|
| committer | Vadim Barkov <vbrkov@gmail.com> | 2018-10-28 03:27:51 +0300 |
| commit | 3feffddd1e8381209a48c24587e36e030051499f (patch) | |
| tree | 48b7c34ea4f12ab644eb9c9e203734796784325a /googlemock/test/gmock-matchers_test.cc | |
| parent | 53d61b5b2382891386bfd41f797118de433b358c (diff) | |
| download | googletest-3feffddd1e8381209a48c24587e36e030051499f.tar.gz googletest-3feffddd1e8381209a48c24587e36e030051499f.zip | |
Replaced all NULLs with nullptr in googlemock
Diffstat (limited to 'googlemock/test/gmock-matchers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index f4e9e9f7..416e9f69 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -323,7 +323,7 @@ TEST(MatcherTest, CanBeImplicitlyConstructedFromValue) { // Tests that NULL can be used in place of Eq(NULL). TEST(MatcherTest, CanBeImplicitlyConstructedFromNULL) { - Matcher<int*> m1 = NULL; + Matcher<int*> m1 = nullptr; EXPECT_TRUE(m1.Matches(nullptr)); int n = 0; EXPECT_FALSE(m1.Matches(&n)); @@ -4779,8 +4779,8 @@ TEST(IsTrueTest, IsTrueIsFalse) { EXPECT_THAT(false, Not(IsTrue())); EXPECT_THAT(0, Not(IsTrue())); EXPECT_THAT(0, IsFalse()); - EXPECT_THAT(NULL, Not(IsTrue())); - EXPECT_THAT(NULL, IsFalse()); + EXPECT_THAT(nullptr, Not(IsTrue())); + EXPECT_THAT(nullptr, IsFalse()); EXPECT_THAT(-1, IsTrue()); EXPECT_THAT(-1, Not(IsFalse())); EXPECT_THAT(1, IsTrue()); |
