third_party/WebKit/Source/platform/TraceEvent.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: third_party/WebKit/Source/platform/TraceEvent.h

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

Patch Set: Removing unneeded include Created 5 years 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: third_party/WebKit/Source/platform/TraceEvent.h

diff --git a/third_party/WebKit/Source/platform/TraceEvent.h b/third_party/WebKit/Source/platform/TraceEvent.h

index c7eda727580cb5d26954f95ce0d12cb2a9f95b91..20b6b7bc17caaa5fd2bf686401dbbb25811e5311 100644

--- a/third_party/WebKit/Source/platform/TraceEvent.h

+++ b/third_party/WebKit/Source/platform/TraceEvent.h

@@ -269,8 +269,8 @@ public:

typedef MangleBehavior<false> DontMangle;

typedef MangleBehavior<true> ForceMangle;

- TraceID(const void* id, unsigned* flags) :

- m_data(static_cast<unsigned long long>(reinterpret_cast<unsigned long>(id)))

+ TraceID(const void* id, unsigned* flags)

+ : m_data(static_cast<unsigned long long>(reinterpret_cast<uintptr_t>(id)))

{

*flags |= TRACE_EVENT_FLAG_MANGLE_ID;

}