core/src/fxcrt/fx_basic_bstring.cpp - Issue 900753002: Add namespace and re-arrange PDFium's local copy of chromium /base.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fxcrt/fx_basic_bstring.cpp

Issue 900753002: Add namespace and re-arrange PDFium's local copy of chromium /base. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: core/src/fxcrt/fx_basic_bstring.cpp

diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp

index 0d4f860b3290698e2dc8f5f59d604850465eb5bd..84e63bbbfcaafc9cd520b56c5c0b70045fcad85c 100644

--- a/core/src/fxcrt/fx_basic_bstring.cpp

+++ b/core/src/fxcrt/fx_basic_bstring.cpp

@@ -5,7 +5,7 @@

#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;

+ third_party::base::CheckedNumeric<int> nSize = nLen;

nSize += sizeof(long) * 3 + 1;

CFX_StringData* pData = (CFX_StringData*)FX_Alloc(FX_BYTE, nSize.ValueOrDie());

if (!pData) {

« no previous file with comments | « core/src/fxcrt/fx_basic_array.cpp ('k') | core/src/fxcrt/fx_basic_wstring.cpp » ('j') | third_party/base/logging.h » ('J')