Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(803)

Unified Diff: mojo/public/cpp/utility/lib/thread.cc

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698