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-internal-utils_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-internal-utils_test.cc')
| -rw-r--r-- | googlemock/test/gmock-internal-utils_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc index 5f53077c..7116e4fc 100644 --- a/googlemock/test/gmock-internal-utils_test.cc +++ b/googlemock/test/gmock-internal-utils_test.cc @@ -158,9 +158,9 @@ TEST(GetRawPointerTest, WorksForSmartPointers) { } TEST(GetRawPointerTest, WorksForRawPointers) { - int* p = NULL; + int* p = nullptr; // Don't use EXPECT_EQ as no NULL-testing magic on Symbian. - EXPECT_TRUE(NULL == GetRawPointer(p)); + EXPECT_TRUE(nullptr == GetRawPointer(p)); int n = 1; EXPECT_EQ(&n, GetRawPointer(&n)); } @@ -492,7 +492,7 @@ TEST(LogTest, NoSkippingStackFrameInOptMode) { AllOf(Ge(expected_skip_count), Le(expected_skip_count + 10))); // Restores the default OS stack trace getter. - GetUnitTestImpl()->set_os_stack_trace_getter(NULL); + GetUnitTestImpl()->set_os_stack_trace_getter(nullptr); } // Tests that all logs are printed when the value of the |