summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser/cpdf_array.h
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-11-03 17:05:07 -0700
committerCommit bot <commit-bot@chromium.org>2016-11-03 17:05:08 -0700
commit4de3d095c9d9e961f93750cf1ebd489fd515be12 (patch)
tree81db6141dde9336ec31be9ceadb0183433a394bf /core/fpdfapi/parser/cpdf_array.h
parent7f3a8c3c317b291b44521a6a0c4dd192ad2d5966 (diff)
downloadpdfium-4de3d095c9d9e961f93750cf1ebd489fd515be12.tar.xz
Remove CPDF_Object::Release() in favor of direct delete
Follow-on once we prove Release always deletes in previous CL. Review-Url: https://codereview.chromium.org/2384883003
Diffstat (limited to 'core/fpdfapi/parser/cpdf_array.h')
-rw-r--r--core/fpdfapi/parser/cpdf_array.h8
1 files changed, 3 insertions, 5 deletions
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<CPDF_Object*>::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<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;
@@ -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<CPDF_Array> ToArray(std::unique_ptr<CPDF_Object> obj) {
CPDF_Array* pArray = ToArray(obj.get());
if (!pArray)
return nullptr;
obj.release();
- return UniqueArray(pArray);
+ return std::unique_ptr<CPDF_Array>(pArray);
}
#endif // CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_