From 62a70f90c49cf7714c960186eb063ad55333e6f3 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 21 Mar 2016 15:00:20 -0700 Subject: Remove FX_WORD in favor of uint16_t. It isn't buying us anthing, and it looks strange in a struct when other uint types are already present. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1821043003 . --- core/include/fxcrt/fx_basic.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'core/include/fxcrt/fx_basic.h') diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 11c573be6e..277286c80c 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -205,10 +205,10 @@ class CFX_FileBufferArchive { class CFX_CharMap { public: - static CFX_ByteString GetByteString(FX_WORD codepage, + static CFX_ByteString GetByteString(uint16_t codepage, const CFX_WideString& wstr); - static CFX_WideString GetWideString(FX_WORD codepage, + static CFX_WideString GetWideString(uint16_t codepage, const CFX_ByteString& bstr); CFX_CharMap() = delete; @@ -402,7 +402,6 @@ typedef CFX_ArrayTemplate CFX_DWordArray; #ifdef PDF_ENABLE_XFA typedef CFX_ArrayTemplate CFX_WideStringCArray; -typedef CFX_ArrayTemplate CFX_WordArray; typedef CFX_ArrayTemplate CFX_FloatArray; typedef CFX_ArrayTemplate CFX_ByteArray; typedef CFX_ArrayTemplate CFX_Int32Array; -- cgit v1.2.3