diff options
author | Luis Hector Chavez <lhchavez@google.com> | 2016-05-27 13:54:18 -0700 |
---|---|---|
committer | Luis Hector Chavez <lhchavez@google.com> | 2016-05-27 13:57:13 -0700 |
commit | 43625e411feabd7df36a8768ba8c4eca58a22e4d (patch) | |
tree | a125cec814362b362eefa3b70bec5eef746400b9 /third_party/chromium/base/memory/weak_ptr.h | |
parent | 51805a169e3ac961a84d6de222b0797cfff0f919 (diff) | |
parent | 637be7990843742d7ac6910ea909dcb09e9df175 (diff) | |
download | libweave-43625e411feabd7df36a8768ba8c4eca58a22e4d.tar.gz |
Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'
eed24467 Add volume trait to the test_schema device.
369d2f07 correcting volume property maximum value in if condition checking of volume trait of test_schema device.
d1f98a07 examples: remove samples with private traits
637be79 libweave: Update libchrome APIs to r395517
Change-Id: I69b312a616e67970f5cce82e7bd53a6dd266f36c
Diffstat (limited to 'third_party/chromium/base/memory/weak_ptr.h')
-rw-r--r-- | third_party/chromium/base/memory/weak_ptr.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/third_party/chromium/base/memory/weak_ptr.h b/third_party/chromium/base/memory/weak_ptr.h index 601c379..2efb024 100644 --- a/third_party/chromium/base/memory/weak_ptr.h +++ b/third_party/chromium/base/memory/weak_ptr.h @@ -3,7 +3,7 @@ // found in the LICENSE file. // Weak pointers are pointers to an object that do not affect its lifetime, -// and which may be invalidated (i.e. reset to NULL) by the object, or its +// and which may be invalidated (i.e. reset to nullptr) by the object, or its // owner, at any time, most commonly when the object is about to be deleted. // Weak pointers are useful when an object needs to be accessed safely by one @@ -70,6 +70,7 @@ #ifndef BASE_MEMORY_WEAK_PTR_H_ #define BASE_MEMORY_WEAK_PTR_H_ +#include <cstddef> #include <type_traits> #include "base/base_export.h" @@ -197,8 +198,9 @@ template <typename T> class WeakPtrFactory; template <typename T> class WeakPtr : public internal::WeakPtrBase { public: - WeakPtr() : ptr_(NULL) { - } + WeakPtr() : ptr_(nullptr) {} + + WeakPtr(std::nullptr_t) : ptr_(nullptr) {} // Allow conversion from U to T provided U "is a" T. Note that this // is separate from the (implicit) copy constructor. @@ -206,20 +208,20 @@ class WeakPtr : public internal::WeakPtrBase { WeakPtr(const WeakPtr<U>& other) : WeakPtrBase(other), ptr_(other.ptr_) { } - T* get() const { return ref_.is_valid() ? ptr_ : NULL; } + T* get() const { return ref_.is_valid() ? ptr_ : nullptr; } T& operator*() const { - DCHECK(get() != NULL); + DCHECK(get() != nullptr); return *get(); } T* operator->() const { - DCHECK(get() != NULL); + DCHECK(get() != nullptr); return get(); } void reset() { ref_ = internal::WeakReference(); - ptr_ = NULL; + ptr_ = nullptr; } // Implement "Safe Bool Idiom" @@ -244,7 +246,7 @@ class WeakPtr : public internal::WeakPtrBase { typedef T* WeakPtr::*Testable; public: - operator Testable() const { return get() ? &WeakPtr::ptr_ : NULL; } + operator Testable() const { return get() ? &WeakPtr::ptr_ : nullptr; } private: // Explicitly declare comparison operators as required by the "Safe Bool @@ -263,7 +265,7 @@ class WeakPtr : public internal::WeakPtrBase { } // This pointer is only valid when ref_.is_valid() is true. Otherwise, its - // value is undefined (as opposed to NULL). + // value is undefined (as opposed to nullptr). T* ptr_; }; @@ -278,9 +280,7 @@ class WeakPtrFactory { explicit WeakPtrFactory(T* ptr) : ptr_(ptr) { } - ~WeakPtrFactory() { - ptr_ = NULL; - } + ~WeakPtrFactory() { ptr_ = nullptr; } WeakPtr<T> GetWeakPtr() { DCHECK(ptr_); |