| Index: util/mach/exception_ports_test.cc
|
| diff --git a/util/mach/exception_ports_test.cc b/util/mach/exception_ports_test.cc
|
| index 7e98a41d1e4bb2133207749e2f1926bc8fb654cd..9007305e5341e7dbbf10437945618baa3f506f2d 100644
|
| --- a/util/mach/exception_ports_test.cc
|
| +++ b/util/mach/exception_ports_test.cc
|
| @@ -186,7 +186,7 @@ class TestExceptionPorts : public UniversalMachExcServer,
|
| // function returning type void, and the interface dictates otherwise here.
|
| if (exception == EXC_CRASH && code_count >= 1) {
|
| int signal;
|
| - ExcCrashRecoverOriginalException(code[0], NULL, &signal);
|
| + ExcCrashRecoverOriginalException(code[0], nullptr, &signal);
|
|
|
| // The child crashed with a division by zero, which shows up as SIGFPE.
|
| // This was chosen because it’s unlikely to be generated by testing or
|
| @@ -231,7 +231,7 @@ class TestExceptionPorts : public UniversalMachExcServer,
|
| }
|
| }
|
|
|
| - int rv_int = pthread_create(&thread_, NULL, ThreadMainThunk, this);
|
| + int rv_int = pthread_create(&thread_, nullptr, ThreadMainThunk, this);
|
| ASSERT_EQ(0, rv_int);
|
|
|
| // Wait for the new thread to be ready.
|
| @@ -271,7 +271,7 @@ class TestExceptionPorts : public UniversalMachExcServer,
|
| }
|
|
|
| // Reap the other thread.
|
| - rv_int = pthread_join(thread_, NULL);
|
| + rv_int = pthread_join(thread_, nullptr);
|
| ASSERT_EQ(0, rv_int);
|
| }
|
|
|
| @@ -320,7 +320,7 @@ class TestExceptionPorts : public UniversalMachExcServer,
|
| Crash();
|
| }
|
|
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| // Crashes by performing a division by zero. The assignment is present to
|
|
|