diff options
| author | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-07 23:09:07 -0400 |
|---|---|---|
| committer | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-07 23:09:07 -0400 |
| commit | 4327d95b3e5e13aab0d2edcf6cc7d2060f83f89a (patch) | |
| tree | f33a48a60c4b6c3d0c7ea58588af56ddefce1051 /googlemock/test/gmock-generated-matchers_test.cc | |
| parent | 7caf5ffd1dc8db7625b393a36846471e5c5f45e3 (diff) | |
| parent | 40f82ce56a4b416aa4631e48d1d07377793b18ee (diff) | |
| download | googletest-4327d95b3e5e13aab0d2edcf6cc7d2060f83f89a.tar.gz googletest-4327d95b3e5e13aab0d2edcf6cc7d2060f83f89a.tar.bz2 googletest-4327d95b3e5e13aab0d2edcf6cc7d2060f83f89a.zip | |
Merge branch 'master' of https://github.com/google/googletest
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; |