summaryrefslogtreecommitdiff
path: root/core/include/fxcrt/fx_basic.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-01-25 15:55:59 -0800
committerTom Sepez <tsepez@chromium.org>2016-01-25 15:55:59 -0800
commit52bb44383a705b600e0d028bff5ade17856f5a60 (patch)
tree3d8446e16ff1087c729660746d2af92ce828c7d2 /core/include/fxcrt/fx_basic.h
parente24ea22700c9fc534d40cc510d59c453aa9d0ddb (diff)
downloadpdfium-52bb44383a705b600e0d028bff5ade17856f5a60.tar.xz
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 .
Diffstat (limited to 'core/include/fxcrt/fx_basic.h')
-rw-r--r--core/include/fxcrt/fx_basic.h2
1 files changed, 2 insertions, 0 deletions
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_ByteString> CFX_ByteStringArray;
typedef CFX_ObjectArray<CFX_WideString> 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 DataType, int FixedSize>
class CFX_FixedBufGrow {
public: