diff options
| author |  mtklein <mtklein@chromium.org> | 2015-11-23 09:12:31 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-23 09:12:31 -0800 |
| commit | 06189155d987db5c7e69015f6ea87c2168d6a065 (patch) | |
| tree | 61b3175e4965dadab1d6039e83153babea79de04 /include/private/SkOncePtr.h | |
| parent | 125f19a2964c31a660256132acbce60e8a3e6752 (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
Review URL: https://codereview.chromium.org/1436033003
Diffstat (limited to 'include/private/SkOncePtr.h')
| -rw-r--r-- | include/private/SkOncePtr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/private/SkOncePtr.h b/include/private/SkOncePtr.h index 261f9a7ef4..3c1ab634ee 100644 --- a/include/private/SkOncePtr.h +++ b/include/private/SkOncePtr.h @@ -9,7 +9,7 @@ #define SkOncePtr_DEFINED #include "../private/SkAtomics.h" -#include "SkUniquePtr.h" +#include <memory> template <typename T> class SkBaseOncePtr; @@ -17,7 +17,7 @@ template <typename T> class SkBaseOncePtr; #define SK_DECLARE_STATIC_ONCE_PTR(type, name) namespace {} static SkBaseOncePtr<type> name; // Use this for a local or member pointer that's initialized exactly once when you call get(). -template <typename T, typename Delete = skstd::default_delete<T>> +template <typename T, typename Delete = std::default_delete<T>> class SkOncePtr : SkNoncopyable { public: SkOncePtr() { sk_bzero(this, sizeof(*this)); } @@ -42,7 +42,7 @@ private: // If you ask for SkOncePtr<T[]>, we'll clean up with delete[] by default. template <typename T> -class SkOncePtr<T[]> : public SkOncePtr<T, skstd::default_delete<T[]>> {}; +class SkOncePtr<T[]> : public SkOncePtr<T, std::default_delete<T[]>> {}; /* TODO(mtklein): in next CL typedef SkBaseOncePtr<void> SkOnceFlag; |