diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-02-05 10:03:18 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-02-05 10:03:18 -0800 |
| commit | 35425896b07b5124651c249d6ce29285cf71ea3b (patch) | |
| tree | 0cd30ec338fffdebb3aee6a899beeb3835c6f194 /core/src/fxcrt/fx_basic_bstring.cpp | |
| parent | 53476d6956781ceb252e1ae5e01f83a48bcb4908 (diff) | |
| download | pdfium-35425896b07b5124651c249d6ce29285cf71ea3b.tar.xz | |
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
Diffstat (limited to 'core/src/fxcrt/fx_basic_bstring.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_bstring.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp index 0d4f860b32..39104e29f6 100644 --- a/core/src/fxcrt/fx_basic_bstring.cpp +++ b/core/src/fxcrt/fx_basic_bstring.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 int _Buffer_itoa(char* buf, int i, FX_DWORD flags) { @@ -52,7 +52,7 @@ static CFX_StringData* FX_AllocString(int nLen) if (nLen == 0 || nLen < 0) { return NULL; } - base::CheckedNumeric<int> nSize = nLen; + pdfium::base::CheckedNumeric<int> nSize = nLen; nSize += sizeof(long) * 3 + 1; CFX_StringData* pData = (CFX_StringData*)FX_Alloc(FX_BYTE, nSize.ValueOrDie()); if (!pData) { |