diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-10-05 16:23:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 16:23:55 -0400 |
| commit | 3149e0e88bf09841009851a478dd835fc557aaa1 (patch) | |
| tree | 22e38a6ba9e82b964f620f55cddb03033e1ffc4b /googlemock/test/gmock-generated-matchers_test.cc | |
| parent | 4b82df5bb3fab5f6f19a41b7a232f54e37a66d6b (diff) | |
| parent | 40f82ce56a4b416aa4631e48d1d07377793b18ee (diff) | |
| download | googletest-3149e0e88bf09841009851a478dd835fc557aaa1.tar.gz googletest-3149e0e88bf09841009851a478dd835fc557aaa1.tar.bz2 googletest-3149e0e88bf09841009851a478dd835fc557aaa1.zip | |
Merge branch 'master' into python3-tests
Diffstat (limited to 'googlemock/test/gmock-generated-matchers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-generated-matchers_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/test/gmock-generated-matchers_test.cc b/googlemock/test/gmock-generated-matchers_test.cc index 0ebd4701..10a4ac39 100644 --- a/googlemock/test/gmock-generated-matchers_test.cc +++ b/googlemock/test/gmock-generated-matchers_test.cc @@ -697,7 +697,7 @@ TEST(ElementsAreArrayTest, CanBeCreatedWithIteratorRange) { // Pointers are iterators, too. EXPECT_THAT(test_vector, ElementsAreArray(a, a + GTEST_ARRAY_SIZE_(a))); // The empty range of NULL pointers should also be okay. - int* const null_int = NULL; + int* const null_int = nullptr; EXPECT_THAT(test_vector, Not(ElementsAreArray(null_int, null_int))); EXPECT_THAT((vector<int>()), ElementsAreArray(null_int, null_int)); } @@ -770,7 +770,7 @@ MATCHER_P2(EqSumOf, x, y, std::string(negation ? "doesn't equal" : "equals") + } else { // Verifies that we can stream to the underlying stream of // result_listener. - if (result_listener->stream() != NULL) { + if (result_listener->stream() != nullptr) { *result_listener->stream() << "diff == " << (x + y - arg); } return false; |