| Index: include/utils/win/SkTScopedComPtr.h
|
| diff --git a/include/utils/win/SkTScopedComPtr.h b/include/utils/win/SkTScopedComPtr.h
|
| index 6fb6143adc71a74c4d74b9cc807921cfbadfa4e9..58bf8733a4d8daa73b833ed175ed74236bf4fb5c 100644
|
| --- a/include/utils/win/SkTScopedComPtr.h
|
| +++ b/include/utils/win/SkTScopedComPtr.h
|
| @@ -37,11 +37,11 @@ private:
|
| T *fPtr;
|
|
|
| public:
|
| - explicit SkTScopedComPtr(T *ptr = NULL) : fPtr(ptr) { }
|
| + explicit SkTScopedComPtr(T *ptr = nullptr) : fPtr(ptr) { }
|
| ~SkTScopedComPtr() {
|
| this->reset();
|
| }
|
| - T &operator*() const { SkASSERT(fPtr != NULL); return *fPtr; }
|
| + T &operator*() const { SkASSERT(fPtr != nullptr); return *fPtr; }
|
| SkBlockComRef<T> *operator->() const {
|
| return static_cast<SkBlockComRef<T>*>(fPtr);
|
| }
|
| @@ -51,12 +51,13 @@ public:
|
| * Must only be used on instances currently pointing to NULL,
|
| * and only to initialize the instance.
|
| */
|
| - T **operator&() { SkASSERT(fPtr == NULL); return &fPtr; }
|
| + T **operator&() { SkASSERT(fPtr == nullptr); return &fPtr; }
|
| + explicit operator bool() const { return fPtr != nullptr; }
|
| T *get() const { return fPtr; }
|
| void reset() {
|
| if (this->fPtr) {
|
| this->fPtr->Release();
|
| - this->fPtr = NULL;
|
| + this->fPtr = nullptr;
|
| }
|
| }
|
|
|
| @@ -68,7 +69,7 @@ public:
|
|
|
| T* release() {
|
| T* temp = this->fPtr;
|
| - this->fPtr = NULL;
|
| + this->fPtr = nullptr;
|
| return temp;
|
| }
|
| };
|
|
|