Fixed void* to uint64_t cast on win64 in TraceID.
On win64, long is 32-bit. Found by GCC (mingw-w64) build, where this causes an error.
This is the Skia version of https://codereview.chromium.org/374043002 .
R=bungeman@google.com, humper@google.com
Author: cjacek@gmail.com
Review URL: https://codereview.chromium.org/510923002
diff --git a/src/core/SkTraceEvent.h b/src/core/SkTraceEvent.h
index 0c7989f..34e3adf 100644
--- a/src/core/SkTraceEvent.h
+++ b/src/core/SkTraceEvent.h
@@ -949,7 +949,7 @@
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 @@
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()) {
