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