From 33fdebc3da676bff84d0fd0f69b9087c0c12dfeb Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 4 Nov 2016 11:38:40 -0700 Subject: Reland "Remove CPDF_Object::Release() in favor of direct delete" This reverts commit f0d5b6c35fa343108a3ab7a25bc2cc2b3cf105b3. Review-Url: https://codereview.chromium.org/2478303002 --- core/fpdfapi/parser/cpdf_array.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'core/fpdfapi/parser/cpdf_array.h') diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h index 8cfa0333bb..9deb478809 100644 --- a/core/fpdfapi/parser/cpdf_array.h +++ b/core/fpdfapi/parser/cpdf_array.h @@ -21,6 +21,7 @@ class CPDF_Array : public CPDF_Object { using const_iterator = std::vector::const_iterator; CPDF_Array(); + ~CPDF_Array() override; // CPDF_Object. Type GetType() const override; @@ -61,15 +62,12 @@ class CPDF_Array : public CPDF_Object { const_iterator end() const { return m_Objects.end(); } protected: - ~CPDF_Array() override; - CPDF_Object* CloneNonCyclic( bool bDirect, std::set* pVisited) const override; std::vector m_Objects; }; -using UniqueArray = std::unique_ptr>; inline CPDF_Array* ToArray(CPDF_Object* obj) { return obj ? obj->AsArray() : nullptr; @@ -79,12 +77,12 @@ inline const CPDF_Array* ToArray(const CPDF_Object* obj) { return obj ? obj->AsArray() : nullptr; } -inline UniqueArray ToArray(UniqueObject obj) { +inline std::unique_ptr ToArray(std::unique_ptr obj) { CPDF_Array* pArray = ToArray(obj.get()); if (!pArray) return nullptr; obj.release(); - return UniqueArray(pArray); + return std::unique_ptr(pArray); } #endif // CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_ -- cgit v1.2.3