core/src/fxcrt/fx_basic_wstring.cpp - Issue 1783023002: Re-enable MSVC warning 4800 for compiling with chromium_code

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_wstring.cpp

Issue 1783023002: Re-enable MSVC warning 4800 for compiling with chromium_code (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Created 4 years, 9 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_wstring.cpp

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

index 11a840a806d4a9e98e1fe1a856eb2aca3c4e61cc..a96233d1da6b1870a1e8f4fb29a89dd832a26ea1 100644

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

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

@@ -205,7 +205,7 @@ bool CFX_WideString::Equal(const wchar_t* ptr) const {

if (!ptr) {

return m_pData->m_nDataLength == 0;

}

- return wcslen(ptr) == m_pData->m_nDataLength &&

+ return wcslen(ptr) == static_cast<unsigned int>(m_pData->m_nDataLength) &&

Tom Sepez 2016/03/11 00:30:28 wcslen() returns a size_t, so maybe we want to cas

Wei Li 2016/03/11 04:11:36 Done.

wmemcmp(ptr, m_pData->m_String, m_pData->m_nDataLength) == 0;

}

bool CFX_WideString::Equal(const CFX_WideStringC& str) const {

« core/src/fpdfdoc/doc_formfield.cpp ('K') | « core/src/fxcrt/fx_basic_buffer.cpp ('k') | core/src/fxge/agg/fx_agg_driver.cpp » ('j') | core/src/fxge/ge/fx_ge_fontmap.cpp » ('J')