diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-02-05 09:46:23 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-02-05 09:46:23 -0800 |
| commit | dabc5d57bf473708295800a7991bc1fafdf76288 (patch) | |
| tree | 9dfb8313596dd61e2c600cf02548b191f9753daf /core/src/fxcrt/fx_basic_wstring.cpp | |
| parent | 7061d1af45752617fafa85e2242dc5b2844650b5 (diff) | |
| download | pdfium-dabc5d57bf473708295800a7991bc1fafdf76288.tar.xz | |
Add namespace and-re-arrange PDFium's local copy of chromium /base.
Any projects DEPS'd into chromium and requiring a /base
subset should have a local copy of that subset in a
separate namespace. This will avoid future naming conflicts.
Re-arrange the directory structure to better identify what
came from chromium's base, and to make drop-in replacement
easier for files that contain hard-coded "base/" in their
#include directives.
R=jam@chromium.org
Review URL: https://codereview.chromium.org/900753002
Diffstat (limited to 'core/src/fxcrt/fx_basic_wstring.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_wstring.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index 0945d2f1c5..dfdbef8bd6 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.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" static CFX_StringDataW* FX_AllocStringW(int nLen) { @@ -13,7 +13,7 @@ static CFX_StringDataW* FX_AllocStringW(int nLen) return NULL; } - base::CheckedNumeric<int> iSize = static_cast<int>(sizeof(FX_WCHAR)); + pdfium::base::CheckedNumeric<int> iSize = static_cast<int>(sizeof(FX_WCHAR)); iSize *= nLen + 1; iSize += sizeof(long) * 3; CFX_StringDataW* pData = (CFX_StringDataW*)FX_Alloc(FX_BYTE, iSize.ValueOrDie()); @@ -435,7 +435,7 @@ void CFX_WideString::AllocCopy(CFX_WideString& dest, FX_STRSIZE nCopyLen, FX_STR if (nCopyLen == 0 || nCopyLen < 0) { return; } - base::CheckedNumeric<FX_STRSIZE> iSize = static_cast<FX_STRSIZE>(sizeof(FX_WCHAR)); + pdfium::base::CheckedNumeric<FX_STRSIZE> iSize = static_cast<FX_STRSIZE>(sizeof(FX_WCHAR)); iSize *= nCopyLen; ASSERT(dest.m_pData == NULL); dest.m_pData = FX_AllocStringW(nCopyLen); |