summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser/cpdf_array.h
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi/parser/cpdf_array.h')
-rw-r--r--core/fpdfapi/parser/cpdf_array.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h
index 9deb478809..8cfa0333bb 100644
--- a/core/fpdfapi/parser/cpdf_array.h
+++ b/core/fpdfapi/parser/cpdf_array.h
@@ -21,7 +21,6 @@ class CPDF_Array : public CPDF_Object {
using const_iterator = std::vector<CPDF_Object*>::const_iterator;
CPDF_Array();
- ~CPDF_Array() override;
// CPDF_Object.
Type GetType() const override;
@@ -62,12 +61,15 @@ 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<const CPDF_Object*>* pVisited) const override;
std::vector<CPDF_Object*> m_Objects;
};
+using UniqueArray = std::unique_ptr<CPDF_Array, ReleaseDeleter<CPDF_Object>>;
inline CPDF_Array* ToArray(CPDF_Object* obj) {
return obj ? obj->AsArray() : nullptr;
@@ -77,12 +79,12 @@ inline const CPDF_Array* ToArray(const CPDF_Object* obj) {
return obj ? obj->AsArray() : nullptr;
}
-inline std::unique_ptr<CPDF_Array> ToArray(std::unique_ptr<CPDF_Object> obj) {
+inline UniqueArray ToArray(UniqueObject obj) {
CPDF_Array* pArray = ToArray(obj.get());
if (!pArray)
return nullptr;
obj.release();
- return std::unique_ptr<CPDF_Array>(pArray);
+ return UniqueArray(pArray);
}
#endif // CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_