From 4af5fd19d4101079d5a47412e07a5daaf3dade6e Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 1 Apr 2016 15:31:40 -0700 Subject: Remove CFX_ string type static initializers. In XFA, we were constructing some CFX_ string types before we reached main(). Setting breakpoints on these as well as main() shows we hit main first after applying the patch. Doing so also turned up an unused variable, presumably because the static initializer made it appear used. Review URL: https://codereview.chromium.org/1846353002 --- xfa/fxfa/fm2js/xfa_expression.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/fm2js/xfa_expression.cpp') diff --git a/xfa/fxfa/fm2js/xfa_expression.cpp b/xfa/fxfa/fm2js/xfa_expression.cpp index 0166fa609f..be9fb09c0d 100644 --- a/xfa/fxfa/fm2js/xfa_expression.cpp +++ b/xfa/fxfa/fm2js/xfa_expression.cpp @@ -10,11 +10,11 @@ namespace { -const CFX_WideStringC RUNTIMEBLOCKTEMPARRAY = - FX_WSTRC(L"foxit_xfa_formcalc_runtime_block_temp_array"); +const FX_WCHAR RUNTIMEBLOCKTEMPARRAY[] = + L"foxit_xfa_formcalc_runtime_block_temp_array"; -const CFX_WideStringC RUNTIMEBLOCKTEMPARRAYINDEX = - FX_WSTRC(L"foxit_xfa_formcalc_runtime_block_temp_array_index"); +const FX_WCHAR RUNTIMEBLOCKTEMPARRAYINDEX[] = + L"foxit_xfa_formcalc_runtime_block_temp_array_index"; } // namespace -- cgit v1.2.3