aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock-internal-utils_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'googlemock/test/gmock-internal-utils_test.cc')
-rw-r--r--googlemock/test/gmock-internal-utils_test.cc6
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