From 6581175666ba4e1eb2826142376cbfe4495c6e76 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 11 Jun 2015 12:17:45 -0700 Subject: Merge to XFA: Kill FXSYS_mem{cpy,cmp,set.move}{32,8}. Only manual merge was core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp follwed by scripts. Original Review URL: https://codereview.chromium.org/1179693003. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1179953002. --- core/include/fxcrt/fx_basic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 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 da83b14b08..85ade1a115 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -744,7 +744,7 @@ public: if (data_size > FixedSize) { m_pData = FX_Alloc(DataType, data_size); } else { - FXSYS_memset32(m_Data, 0, sizeof(DataType)*FixedSize); + FXSYS_memset(m_Data, 0, sizeof(DataType)*FixedSize); } } void SetDataSize(int data_size) @@ -756,7 +756,7 @@ public: if (data_size > FixedSize) { m_pData = FX_Alloc(DataType, data_size); } else { - FXSYS_memset32(m_Data, 0, sizeof(DataType)*FixedSize); + FXSYS_memset(m_Data, 0, sizeof(DataType)*FixedSize); } } ~CFX_FixedBufGrow() -- cgit v1.2.3