Index: base/debug/trace_event.h |
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h |
index 686bd38790cbe561a418f25ec2f4d4bc2476b383..dcb332d8796f12d1a4fc3876bcd29c3240f11107 100644 |
--- a/base/debug/trace_event.h |
+++ b/base/debug/trace_event.h |
@@ -1003,7 +1003,7 @@ class TraceID { |
public: |
explicit DontMangle(const void* id) |
: data_(static_cast<unsigned long long>( |
- reinterpret_cast<unsigned long>(id))) {} |
+ reinterpret_cast<uintptr_t>(id))) {} |
explicit DontMangle(unsigned long long id) : data_(id) {} |
explicit DontMangle(unsigned long id) : data_(id) {} |
explicit DontMangle(unsigned int id) : data_(id) {} |
@@ -1045,10 +1045,9 @@ class TraceID { |
private: |
unsigned long long data_; |
}; |
- |
TraceID(const void* id, unsigned char* flags) |
: data_(static_cast<unsigned long long>( |
- 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()) { |