diff options
| author |  mtklein <mtklein@google.com> | 2015-11-16 13:05:37 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-16 13:05:37 -0800 |
| commit | 566b23c571dbec97925ad0c44e744126a62e5a1e (patch) | |
| tree | 05e55fc33a38394f582b3fae0f91b3f9affaacd3 /include/core/SkRefCnt.h | |
| parent | 755c553c17b82bb5de3d9cc8d3b2a866ff9e9e50 (diff) | |
Revert of skstd -> std for unique_ptr (patchset #9 id:160001 of https://codereview.chromium.org/1436033003/ )
Reason for revert:
10.9 bots are too old too.
Original issue's description:
> skstd -> std for unique_ptr
>
> TBR=reed@google.com
> No public API changes.
>
> BUG=skia:4564
>
> Committed: https://skia.googlesource.com/skia/+/755c553c17b82bb5de3d9cc8d3b2a866ff9e9e50
TBR=bungeman@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4564
Review URL: https://codereview.chromium.org/1446413002
Diffstat (limited to 'include/core/SkRefCnt.h')
| -rw-r--r-- | include/core/SkRefCnt.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h index 1033bccc88..0e8d857722 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,9 +185,9 @@ template <typename T> struct SkTUnref { /** * Utility class that simply unref's its argument in the destructor. */ -template <typename T> class SkAutoTUnref : public std::unique_ptr<T, SkTUnref<T>> { +template <typename T> class SkAutoTUnref : public skstd::unique_ptr<T, SkTUnref<T>> { public: - explicit SkAutoTUnref(T* obj = nullptr) : std::unique_ptr<T, SkTUnref<T>>(obj) {} + explicit SkAutoTUnref(T* obj = nullptr) : skstd::unique_ptr<T, SkTUnref<T>>(obj) {} T* detach() { return this->release(); } operator T*() const { return this->get(); } |