diff options
| author |  mtklein <mtklein@google.com> | 2016-03-11 06:10:30 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-11 06:10:30 -0800 |
| commit | 218c846ac0509f70d6da3eb3a439fa89b589f7b5 (patch) | |
| tree | ce30ddb73a716cdc25ac2cc8c7f159d3168a8792 /include/core/SkRefCnt.h | |
| parent | 3dd9ed37c24611af86f0fe374bd3698b63f09450 (diff) | |
Revert of Use std::unique_ptr. (patchset #8 id:130001 of https://codereview.chromium.org/1780933003/ )
Reason for revert:
Another Android ambiguity due to implicit bool...
frameworks/base/core/jni/android/graphics/Utils.cpp:110:35: error: call of overloaded 'SkMemoryStream(SkAutoTUnref<SkData>&)' is ambiguous
return new SkMemoryStream(data);
Original issue's description:
> Use std::unique_ptr.
>
> TBR=reed@google.com
>
> Committed: https://skia.googlesource.com/skia/+/20c1e3abfc681771f73eb19fde7284196e028940
>
> Committed: https://skia.googlesource.com/skia/+/3dd9ed37c24611af86f0fe374bd3698b63f09450
TBR=bungeman@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1785353002
Diffstat (limited to 'include/core/SkRefCnt.h')
| -rw-r--r-- | include/core/SkRefCnt.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h index 5e334395a9..f159e3b1b7 100644 --- a/include/core/SkRefCnt.h +++ b/include/core/SkRefCnt.h @@ -9,10 +9,9 @@ #define SkRefCnt_DEFINED #include "../private/SkAtomics.h" -#include "../private/SkTLogic.h" +#include "../private/SkUniquePtr.h" #include "SkTypes.h" #include <functional> -#include <memory> #include <utility> #define SK_SUPPORT_TRANSITION_TO_SP_INTERFACES @@ -190,9 +189,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(); } |