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

Unified Diff: mojo/system/memory.h

Issue 597413002: Mojo: NULL -> nullptr in mojo/system and mojo/embedder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: EXPECT_TRUE Created 6 years, 3 months 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
« no previous file with comments | « mojo/system/local_message_pipe_endpoint.cc ('k') | mojo/system/memory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/memory.h
diff --git a/mojo/system/memory.h b/mojo/system/memory.h
index 3602be74d2734333b6b51853850b63d9193bb058..acbbb5421b94177f373b7ca959102a90806b24c3 100644
--- a/mojo/system/memory.h
+++ b/mojo/system/memory.h
@@ -91,15 +91,15 @@ class UserPointer {
// |MakeUserPointer()| (or |NullUserPointer()| for null pointers). (The common
// exception is when you have, e.g., a |char*| and want to get a
// |UserPointer<void>|.)
- UserPointer() : pointer_(NULL) {}
+ UserPointer() : pointer_(nullptr) {}
explicit UserPointer(Type* pointer) : pointer_(pointer) {}
// Allow implicit conversion from the "null user pointer".
- UserPointer(NullUserPointer) : pointer_(NULL) {}
+ UserPointer(NullUserPointer) : pointer_(nullptr) {}
~UserPointer() {}
// Allow assignment from the "null user pointer".
UserPointer<Type>& operator=(NullUserPointer) {
- pointer_ = NULL;
+ pointer_ = nullptr;
return *this;
}
« no previous file with comments | « mojo/system/local_message_pipe_endpoint.cc ('k') | mojo/system/memory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698