summaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock-matchers_test.cc
diff options
context:
space:
mode:
authorVadim Barkov <vbrkov@gmail.com>2018-10-28 00:27:51 (GMT)
committerVadim Barkov <vbrkov@gmail.com>2018-10-28 00:27:51 (GMT)
commit3feffddd1e8381209a48c24587e36e030051499f (patch)
tree48b7c34ea4f12ab644eb9c9e203734796784325a /googlemock/test/gmock-matchers_test.cc
parent53d61b5b2382891386bfd41f797118de433b358c (diff)
downloadgoogletest-3feffddd1e8381209a48c24587e36e030051499f.zip
googletest-3feffddd1e8381209a48c24587e36e030051499f.tar.gz
googletest-3feffddd1e8381209a48c24587e36e030051499f.tar.bz2
Replaced all NULLs with nullptr in googlemockrefs/pull/1941/head
Diffstat (limited to 'googlemock/test/gmock-matchers_test.cc')
-rw-r--r--googlemock/test/gmock-matchers_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc
index f4e9e9f..416e9f6 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());