content/public/common/common_param_traits.h - Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks

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: content/public/common/common_param_traits.h

Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync to latest Created 5 years, 1 month ago

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

Jump to:

Index: content/public/common/common_param_traits.h

diff --git a/content/public/common/common_param_traits.h b/content/public/common/common_param_traits.h

index 69fb84a5fb6c8539656293ca6ce004c12e9ed3a8..fcdd081d2fc39fa9a4b97ff5bf970475c00cbce8 100644

--- a/content/public/common/common_param_traits.h

+++ b/content/public/common/common_param_traits.h

@@ -82,7 +82,8 @@ struct ParamTraits<gfx::NativeWindow> {

static void Write(Message* m, const param_type& p) {

#if defined(OS_WIN)

// HWNDs are always 32 bits on Windows, even on 64 bit systems.

- m->WriteUInt32(reinterpret_cast<uint32>(p));

+ // Cast through uintptr_t and then uint32 to make the truncation explicit.

+ m->WriteUInt32(static_cast<uint32>(reinterpret_cast<uintptr_t>(p)));

#else

m->WriteData(reinterpret_cast<const char*>(&p), sizeof(p));

#endif