Revert of skstd -> std for unique_ptr

include/private/SkTemplates.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkTemplates_DEFINED
 #define SkTemplates_DEFINED
 
 #include "SkMath.h"
 #include "SkTLogic.h"
 #include "SkTypes.h"
+#include "SkUniquePtr.h"
 #include <limits.h>
-#include <memory>
 #include <new>
 
 /** \file SkTemplates.h
 
     This file contains light-weight template classes for type-safe and exception-safe
     resource management.
 */
 
 /**
  *  Marks a local variable as known to be unused (to avoid warnings).
@@ skipping 22 matching lines @@
 };
 
 /** \class SkAutoTCallVProc
 
     Call a function when this goes out of scope. The template uses two
     parameters, the object, and a function that is to be called in the destructor.
     If detach() is called, the object reference is set to null. If the object
     reference is null when the destructor is called, we do not call the
     function.
 */
-template <typename T, void (*P)(T*)> class SkAutoTCallVProc {
+template <typename T, void (*P)(T*)> class SkAutoTCallVProc
+    : public skstd::unique_ptr<T, SkFunctionWrapper<void, T, P>> {
 public:
-    SkAutoTCallVProc(T* obj) : fPtr(obj) {}
+    SkAutoTCallVProc(T* obj): skstd::unique_ptr<T, SkFunctionWrapper<void, T, P>>(obj) {}
 
-    T*        get() const { return fPtr.get(); }
-    operator T*  () const { return fPtr.get(); }
-    T* operator->() const { return fPtr.get(); }
-
-    T* detach() { return fPtr.release(); }
-    void reset(T* ptr = nullptr) { fPtr.reset(ptr); }
-private:
-    std::unique_ptr<T, SkFunctionWrapper<void, T, P>> fPtr;
+    operator T*() const { return this->get(); }
+    T* detach() { return this->release(); }
 };
 
 /** \class SkAutoTCallIProc
 
 Call a function when this goes out of scope. The template uses two
 parameters, the object, and a function that is to be called in the destructor.
 If detach() is called, the object reference is set to null. If the object
 reference is null when the destructor is called, we do not call the
 function.
 */
-template <typename T, int (*P)(T*)> class SkAutoTCallIProc {
+template <typename T, int (*P)(T*)> class SkAutoTCallIProc
+    : public skstd::unique_ptr<T, SkFunctionWrapper<int, T, P>> {
 public:
-    SkAutoTCallIProc(T* obj) : fPtr(obj) {}
+    SkAutoTCallIProc(T* obj): skstd::unique_ptr<T, SkFunctionWrapper<int, T, P>>(obj) {}
 
-    T*        get() const { return fPtr.get(); }
-    operator T*  () const { return fPtr.get(); }
-    T* operator->() const { return fPtr.get(); }
-
-    T* detach() { return fPtr.release(); }
-    void reset(T* ptr = nullptr) { fPtr.reset(ptr); }
-private:
-    std::unique_ptr<T, SkFunctionWrapper<int, T, P>> fPtr;
+    operator T*() const { return this->get(); }
+    T* detach() { return this->release(); }
 };
 
 /** \class SkAutoTDelete
   An SkAutoTDelete<T> is like a T*, except that the destructor of SkAutoTDelete<T>
   automatically deletes the pointer it holds (if any).  That is, SkAutoTDelete<T>
   owns the T object that it points to.  Like a T*, an SkAutoTDelete<T> may hold
   either NULL or a pointer to a T object.  Also like T*, SkAutoTDelete<T> is
   thread-compatible, and once you dereference it, you get the threadsafety
   guarantees of T.
 
   The size of a SkAutoTDelete is small: sizeof(SkAutoTDelete<T>) == sizeof(T*)
 */
-template <typename T> class SkAutoTDelete {
+template <typename T> class SkAutoTDelete : public skstd::unique_ptr<T> {
 public:
-    SkAutoTDelete(T* obj = NULL) : fPtr(obj) {}
+    SkAutoTDelete(T* obj = NULL) : skstd::unique_ptr<T>(obj) {}
 
-    void swap(SkAutoTDelete& other) { fPtr.swap(other.fPtr); }
-
-    T*        get() const { return fPtr.get(); }
-    operator T*  () const { return fPtr.get(); }
-    T* operator->() const { return fPtr.get(); }
-
-    void reset(T* ptr = nullptr) { fPtr.reset(ptr); }
-    void free() { fPtr.reset(nullptr); }
-    T* detach() { return fPtr.release(); }
-    T* release() { return fPtr.release(); }
-private:
-    std::unique_ptr<T> fPtr;
+    operator T*() const { return this->get(); }
+    void free() { this->reset(nullptr); }
+    T* detach() { return this->release(); }
 };
 
-template <typename T> class SkAutoTDeleteArray : public std::unique_ptr<T[]> {
+template <typename T> class SkAutoTDeleteArray : public skstd::unique_ptr<T[]> {
 public:
-    SkAutoTDeleteArray(T array[]) : std::unique_ptr<T[]>(array) {}
+    SkAutoTDeleteArray(T array[]) : skstd::unique_ptr<T[]>(array) {}
 
     void free() { this->reset(nullptr); }
     T* detach() { return this->release(); }
 };
 
 /** Allocate an array of T elements, and free the array in the destructor
  */
 template <typename T> class SkAutoTArray : SkNoncopyable {
 public:
     SkAutoTArray() {
@@ skipping 331 matching lines @@
      * Returns void* because this object does not initialize the
      * memory. Use placement new for types that require a cons.
      */
     void* get() { return fStorage.get(); }
     const void* get() const { return fStorage.get(); }
 private:
     SkAlignedSStorage<sizeof(T)*N> fStorage;
 };
 
 #endif