Index: include/core/SkRefCnt.h |
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h |
index 5e334395a9adbead3d830f27c734b1256fd25066..f159e3b1b705cb70aa63bb540d448241701c0c06 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 @@ |
/** |
* 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(); } |