From f8a943908a414836271a1b7d7e4a97635d941b7f Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Mar 2017 12:13:22 -0700 Subject: Replace CXFA_{Object,Node}Array with std::vector These two ought to happen at the same time as they are intertwined in spots. Remove blatant casts between the two along the way. Change-Id: I9ce5d2faadf1e38aba7cade316560d24a66d8669 Reviewed-on: https://pdfium-review.googlesource.com/2933 Commit-Queue: Tom Sepez Commit-Queue: dsinclair Reviewed-by: dsinclair --- xfa/fxfa/parser/cxfa_resolveprocessor.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_resolveprocessor.h') diff --git a/xfa/fxfa/parser/cxfa_resolveprocessor.h b/xfa/fxfa/parser/cxfa_resolveprocessor.h index d806d57b93..e9c2cce439 100644 --- a/xfa/fxfa/parser/cxfa_resolveprocessor.h +++ b/xfa/fxfa/parser/cxfa_resolveprocessor.h @@ -8,6 +8,7 @@ #define XFA_FXFA_PARSER_CXFA_RESOLVEPROCESSOR_H_ #include +#include #include "xfa/fxfa/parser/xfa_object.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" @@ -21,12 +22,12 @@ class CXFA_ResolveNodesData { ~CXFA_ResolveNodesData(); CXFA_ScriptContext* m_pSC; - CXFA_Object* m_CurNode; + CXFA_Object* m_CurObject; CFX_WideString m_wsName; XFA_HashCode m_uHashName; CFX_WideString m_wsCondition; int32_t m_nLevel; - CXFA_ObjArray m_Nodes; + std::vector m_Objects; // Not owned. uint32_t m_dwStyles; const XFA_SCRIPTATTRIBUTEINFO* m_pScriptAttribute; XFA_RESOVENODE_RSTYPE m_dwFlag; -- cgit v1.2.3