From 35425896b07b5124651c249d6ce29285cf71ea3b Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 5 Feb 2015 10:03:18 -0800 Subject: Merge to XFA: Add namespace and-re-arrange PDFium's local copy of /base. Original revieww URL: https://codereview.chromium.org/900753002 TBR=jam@chromium.org Review URL: https://codereview.chromium.org/880603004 --- core/src/fxcrt/fx_basic_array.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/src/fxcrt/fx_basic_array.cpp') diff --git a/core/src/fxcrt/fx_basic_array.cpp b/core/src/fxcrt/fx_basic_array.cpp index 0694cf9cbd..9bdc607bfe 100644 --- a/core/src/fxcrt/fx_basic_array.cpp +++ b/core/src/fxcrt/fx_basic_array.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../include/fxcrt/fx_basic.h" -#include "../../../third_party/numerics/safe_math.h" +#include "../../../third_party/base/numerics/safe_math.h" CFX_BasicArray::CFX_BasicArray(int unit_size) : m_pData(NULL) @@ -32,7 +32,7 @@ FX_BOOL CFX_BasicArray::SetSize(int nNewSize) } if (m_pData == NULL) { - base::CheckedNumeric totalSize = nNewSize; + pdfium::base::CheckedNumeric totalSize = nNewSize; totalSize *= m_nUnitSize; if (!totalSize.IsValid()) { m_nSize = m_nMaxSize = 0; @@ -51,7 +51,7 @@ FX_BOOL CFX_BasicArray::SetSize(int nNewSize) m_nSize = nNewSize; } else { int nNewMax = nNewSize < m_nMaxSize ? m_nMaxSize : nNewSize; - base::CheckedNumeric totalSize = nNewMax; + pdfium::base::CheckedNumeric totalSize = nNewMax; totalSize *= m_nUnitSize; if (!totalSize.IsValid() || nNewMax < m_nSize) { return FALSE; @@ -70,7 +70,7 @@ FX_BOOL CFX_BasicArray::SetSize(int nNewSize) FX_BOOL CFX_BasicArray::Append(const CFX_BasicArray& src) { int nOldSize = m_nSize; - base::CheckedNumeric newSize = m_nSize; + pdfium::base::CheckedNumeric newSize = m_nSize; newSize += src.m_nSize; if (m_nUnitSize != src.m_nUnitSize || !newSize.IsValid() || !SetSize(newSize.ValueOrDie())) { return FALSE; -- cgit v1.2.3