summaryrefslogtreecommitdiffstats
path: root/mojo/public/cpp/utility/lib/thread.cc
diff options
context:
space:
mode:
Diffstat (limited to 'mojo/public/cpp/utility/lib/thread.cc')
-rw-r--r--mojo/public/cpp/utility/lib/thread.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/public/cpp/utility/lib/thread.cc b/mojo/public/cpp/utility/lib/thread.cc
index a248b1a..40f0bdd 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