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/src/fxcrt/fx_basic_array.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core/src/fxcrt') diff --git a/core/src/fxcrt/fx_basic_array.cpp b/core/src/fxcrt/fx_basic_array.cpp index 9c4aa0fa35..18e2bd26d2 100644 --- a/core/src/fxcrt/fx_basic_array.cpp +++ b/core/src/fxcrt/fx_basic_array.cpp @@ -134,6 +134,7 @@ const void* CFX_BasicArray::GetDataPtr(int index) const { } return m_pData + index * m_nUnitSize; } +#ifdef PDF_ENABLE_XFA CFX_BaseSegmentedArray::CFX_BaseSegmentedArray(int unit_size, int segment_units, int index_size) @@ -338,3 +339,4 @@ void CFX_BaseSegmentedArray::Delete(int index, int count) { } m_DataSize -= count; } +#endif // PDF_ENABLE_XFA -- cgit v1.2.3