From ed5d7aa789ec5ef7b440d7e56b71804b41a928e3 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Tue, 2 Feb 2016 16:02:03 -0800
Subject: Merge to XFA: Kill CFX_ByteArray in master.

One trivial edit in fx_basic.h
Includes both fixes for build breakage.

Review URL: https://codereview.chromium.org/1653253002 .
(cherry picked from commit 9b0a59d659d8083802385649ba74370d65c41e36)

TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1655423002 .
---
 core/include/fxcrt/fx_basic.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/include/fxcrt')

diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index 34c79ee510..291aaaf9f8 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -435,13 +435,13 @@ class CFX_ArrayTemplate : public CFX_BasicArray {
     return -1;
   }
 };
-typedef CFX_ArrayTemplate<uint8_t> CFX_ByteArray;
 typedef CFX_ArrayTemplate<FX_WORD> CFX_WordArray;
 typedef CFX_ArrayTemplate<FX_DWORD> CFX_DWordArray;
 typedef CFX_ArrayTemplate<void*> CFX_PtrArray;
 typedef CFX_ArrayTemplate<FX_FILESIZE> CFX_FileSizeArray;
 #ifdef PDF_ENABLE_XFA
 typedef CFX_ArrayTemplate<FX_FLOAT> CFX_FloatArray;
+typedef CFX_ArrayTemplate<uint8_t> CFX_ByteArray;
 typedef CFX_ArrayTemplate<int32_t> CFX_Int32Array;
 #endif  // PDF_ENABLE_XFA
 
-- 
cgit v1.2.3