diff options
| author |  mtklein <mtklein@chromium.org> | 2015-12-02 10:46:18 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-02 10:46:18 -0800 |
| commit | dadfc245cc9a0279ff7b73da3344f2ca5d139907 (patch) | |
| tree | 9c6bf9da62a5e71ca1242e95b6031f52ee0642e8 /include/core/SkRefCnt.h | |
| parent | 954cbc15b39e1b45c6244f2811b5ac6be6e412fd (diff) | |
skstd -> std for unique_ptr
TBR=reed@google.com
No public API changes.
BUG=skia:4564
Committed: https://skia.googlesource.com/skia/+/755c553c17b82bb5de3d9cc8d3b2a866ff9e9e50
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Mac10.9-Clang-x86_64-Release-CMake-Trybot,Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link-Trybot;client.skia:Perf-Mac10.9-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Trybot,Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Trybot
Committed: https://skia.googlesource.com/skia/+/06189155d987db5c7e69015f6ea87c2168d6a065
Committed: https://skia.googlesource.com/skia/+/70e8dfca4a7f5bce97b8021a6e378c4828b09c8c
Review URL: https://codereview.chromium.org/1436033003
Diffstat (limited to 'include/core/SkRefCnt.h')
| -rw-r--r-- | include/core/SkRefCnt.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h index 0e8d857722..abe3fb2827 100644 --- a/include/core/SkRefCnt.h +++ b/include/core/SkRefCnt.h @@ -9,8 +9,8 @@ #define SkRefCnt_DEFINED #include "../private/SkAtomics.h" -#include "../private/SkUniquePtr.h" #include "SkTypes.h" +#include <memory> /** \class SkRefCntBase @@ -185,12 +185,15 @@ template <typename T> struct SkTUnref { /** * Utility class that simply unref's its argument in the destructor. */ -template <typename T> class SkAutoTUnref : public skstd::unique_ptr<T, SkTUnref<T>> { +template <typename T> class SkAutoTUnref : public std::unique_ptr<T, SkTUnref<T>> { public: - explicit SkAutoTUnref(T* obj = nullptr) : skstd::unique_ptr<T, SkTUnref<T>>(obj) {} + explicit SkAutoTUnref(T* obj = nullptr) : std::unique_ptr<T, SkTUnref<T>>(obj) {} T* detach() { return this->release(); } operator T*() const { return this->get(); } + + // unique_ptr's operator bool() is not always be explicit on Android. Make sure this is. + explicit operator bool() const { return this->get() != nullptr; } }; // Can't use the #define trick below to guard a bare SkAutoTUnref(...) because it's templated. :( |