| Index: mojo/public/cpp/utility/lib/thread.cc
|
| diff --git a/mojo/public/cpp/utility/lib/thread.cc b/mojo/public/cpp/utility/lib/thread.cc
|
| index a248b1a52d437b2ec69455fd886cbc1c0ed15dbb..40f0bdd680c508b8af40d642776531483821f541 100644
|
| --- a/mojo/public/cpp/utility/lib/thread.cc
|
| +++ b/mojo/public/cpp/utility/lib/thread.cc
|
| @@ -49,7 +49,7 @@ void Thread::Join() {
|
| assert(!joined_);
|
|
|
| joined_ = true;
|
| - int rv = pthread_join(thread_, NULL);
|
| + int rv = pthread_join(thread_, nullptr);
|
| MOJO_ALLOW_UNUSED_LOCAL(rv);
|
| assert(rv == 0);
|
| }
|
| @@ -58,7 +58,7 @@ void Thread::Join() {
|
| void* Thread::ThreadRunTrampoline(void* arg) {
|
| Thread* self = static_cast<Thread*>(arg);
|
| self->Run();
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| } // namespace mojo
|
|
|