diff options
| author | Vadim Barkov <vbrkov@gmail.com> | 2018-10-28 00:07:09 (GMT) |
|---|---|---|
| committer | Vadim Barkov <vbrkov@gmail.com> | 2018-10-28 00:10:37 (GMT) |
| commit | 53d61b5b2382891386bfd41f797118de433b358c (patch) | |
| tree | 2598fe8f30a1e8484053cd461adb250023647219 /googletest/test | |
| parent | 2e308484d9693f8251748c295f6ed7ed25d767eb (diff) | |
| download | googletest-53d61b5b2382891386bfd41f797118de433b358c.zip googletest-53d61b5b2382891386bfd41f797118de433b358c.tar.gz googletest-53d61b5b2382891386bfd41f797118de433b358c.tar.bz2 | |
Replaced all NULLs with nullptr in googletest
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/googletest-test-part-test.cc | 2 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/googletest/test/googletest-test-part-test.cc b/googletest/test/googletest-test-part-test.cc index 8c9459e..8a689be 100644 --- a/googletest/test/googletest-test-part-test.cc +++ b/googletest/test/googletest-test-part-test.cc @@ -121,7 +121,7 @@ TEST_F(TestPartResultTest, type) { // Tests TestPartResult::file_name(). TEST_F(TestPartResultTest, file_name) { EXPECT_STREQ("foo/bar.cc", r1_.file_name()); - EXPECT_STREQ(NULL, r3_.file_name()); + EXPECT_STREQ(nullptr, r3_.file_name()); EXPECT_STREQ("foo/bar.cc", r4_.file_name()); } diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 9aff4f0..9a25abd 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -6184,12 +6184,12 @@ TEST_F(FlagfileTest, Empty) { const char* argv[] = { "foo.exe", flagfile_flag.c_str(), - NULL + nullptr }; const char* argv2[] = { "foo.exe", - NULL + nullptr }; GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), false); @@ -6205,12 +6205,12 @@ TEST_F(FlagfileTest, FilterNonEmpty) { const char* argv[] = { "foo.exe", flagfile_flag.c_str(), - NULL + nullptr }; const char* argv2[] = { "foo.exe", - NULL + nullptr }; GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter("abc"), false); @@ -6228,12 +6228,12 @@ TEST_F(FlagfileTest, SeveralFlags) { const char* argv[] = { "foo.exe", flagfile_flag.c_str(), - NULL + nullptr }; const char* argv2[] = { "foo.exe", - NULL + nullptr }; Flags expected_flags; |