Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Unified Diff: src/core/SkTraceEvent.h

Issue 510923002: Fixed void* to uint64_t cast on win64 in TraceID. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkTraceEvent.h
diff --git a/src/core/SkTraceEvent.h b/src/core/SkTraceEvent.h
index 0c7989fb1a7a76ad0ddd01103dc1824b199eb951..34e3adf0eda329b0be187c4b43025d9d940355ce 100644
--- a/src/core/SkTraceEvent.h
+++ b/src/core/SkTraceEvent.h
@@ -949,7 +949,7 @@ class TraceID {
public:
explicit DontMangle(const void* id)
: data_(static_cast<uint64_t>(
- reinterpret_cast<unsigned long>(id))) {}
+ reinterpret_cast<uintptr_t>(id))) {}
explicit DontMangle(uint64_t id) : data_(id) {}
explicit DontMangle(unsigned int id) : data_(id) {}
explicit DontMangle(unsigned short id) : data_(id) {}
@@ -992,7 +992,7 @@ class TraceID {
TraceID(const void* id, unsigned char* flags)
: data_(static_cast<uint64_t>(
- reinterpret_cast<unsigned long>(id))) {
+ reinterpret_cast<uintptr_t>(id))) {
*flags |= TRACE_EVENT_FLAG_MANGLE_ID;
}
TraceID(ForceMangle id, unsigned char* flags) : data_(id.data()) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698