summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser/cpdf_array.h
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-10-13 16:36:20 -0700
committerCommit bot <commit-bot@chromium.org>2016-10-13 16:36:20 -0700
commit1d023881cd53485303c0fcc0b5878e700dc470fd (patch)
tree0f41370ff729b0495f475887a3f6f38a0210aae4 /core/fpdfapi/parser/cpdf_array.h
parent20f8ecc2f44332792c11cf0ac566c0114712b83c (diff)
downloadpdfium-1d023881cd53485303c0fcc0b5878e700dc470fd.tar.xz
Make CPDF_Object containers hold objects via unique pointers.
This tweaks the implementation while leaving the API the same. The API change is more disruptive, so break this part off first. Review-Url: https://codereview.chromium.org/2385293002
Diffstat (limited to 'core/fpdfapi/parser/cpdf_array.h')
-rw-r--r--core/fpdfapi/parser/cpdf_array.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h
index 8cfa0333bb..f473e26800 100644
--- a/core/fpdfapi/parser/cpdf_array.h
+++ b/core/fpdfapi/parser/cpdf_array.h
@@ -17,8 +17,8 @@
class CPDF_Array : public CPDF_Object {
public:
- using iterator = std::vector<CPDF_Object*>::iterator;
- using const_iterator = std::vector<CPDF_Object*>::const_iterator;
+ using iterator = std::vector<UniqueObject>::iterator;
+ using const_iterator = std::vector<UniqueObject>::const_iterator;
CPDF_Array();
@@ -67,8 +67,9 @@ class CPDF_Array : public CPDF_Object {
bool bDirect,
std::set<const CPDF_Object*>* pVisited) const override;
- std::vector<CPDF_Object*> m_Objects;
+ std::vector<UniqueObject> m_Objects;
};
+
using UniqueArray = std::unique_ptr<CPDF_Array, ReleaseDeleter<CPDF_Object>>;
inline CPDF_Array* ToArray(CPDF_Object* obj) {