diff options
author | mtklein <mtklein@chromium.org> | 2016-03-21 09:35:33 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-21 09:35:33 -0700 |
commit | 04cdc4b61879849df63e883e68eecafe6510f423 (patch) | |
tree | 87afc002470d53e6c2f37f7cdd7f428e0d81acc9 /include | |
parent | 3c481001b16288f604a5279bcb4bf46c5dd2b703 (diff) |
Remove transitional explicit operator bool.
These should no longer be necessary. Android's STL should now
be sane.
TBR=reed
This just removes code.
Review URL: https://codereview.chromium.org/1817153002
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkRefCnt.h | 4 | ||||
-rw-r--r-- | include/private/SkTemplates.h | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h index ce8662b6e3..46d475e5e4 100644 --- a/include/core/SkRefCnt.h +++ b/include/core/SkRefCnt.h @@ -200,10 +200,6 @@ public: // Need to update graphics/Shader.cpp. T* detach() { return this->release(); } #endif - - // Android's std::unique_ptr's operator bool() is sometimes not explicit... - // so override it with our own explcitly explicit version. - explicit operator bool() const { return this->get() != nullptr; } }; // Can't use the #define trick below to guard a bare SkAutoTUnref(...) because it's templated. :( diff --git a/include/private/SkTemplates.h b/include/private/SkTemplates.h index e8fbfd5a89..272b5856ad 100644 --- a/include/private/SkTemplates.h +++ b/include/private/SkTemplates.h @@ -101,9 +101,6 @@ public: // Need to update graphics/BitmapRegionDecoder.cpp. T* detach() { return this->release(); } #endif - - // See SkAutoTUnref for why we do this. - explicit operator bool() const { return this->get() != nullptr; } }; template <typename T> class SkAutoTDeleteArray : public std::unique_ptr<T[]> { |