diff options
Diffstat (limited to 'mojo/system/memory.h')
-rw-r--r-- | mojo/system/memory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mojo/system/memory.h b/mojo/system/memory.h index 3602be7..acbbb54 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; } |