From 52bb44383a705b600e0d028bff5ade17856f5a60 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 25 Jan 2016 15:55:59 -0800 Subject: Merge to XFA: Remove CFX_SegmentedArray use from master. Unfortunately, it is still used on the xfa/ side, so exclude it only for non-xfa builds. Original Review URL: https://codereview.chromium.org/1618273004 . (cherry picked from commit c64e4007ee4561ec2ed3ce986191caf9b024ef55) TBR=ochang@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1631863003 . --- core/include/fxcrt/fx_basic.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core/include/fxcrt') diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index d34af8df2b..34c79ee510 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -548,6 +548,7 @@ class CFX_ObjectArray : public CFX_BasicArray { }; typedef CFX_ObjectArray CFX_ByteStringArray; typedef CFX_ObjectArray CFX_WideStringArray; +#ifdef PDF_ENABLE_XFA class CFX_BaseSegmentedArray { public: CFX_BaseSegmentedArray(int unit_size = 1, @@ -613,6 +614,7 @@ class CFX_SegmentedArray : public CFX_BaseSegmentedArray { return *(ElementType*)CFX_BaseSegmentedArray::GetAt(index); } }; +#endif // PDF_ENABLE_XFA template class CFX_FixedBufGrow { public: -- cgit v1.2.3