summaryrefslogtreecommitdiffstats
path: root/base/debug/trace_event.h
diff options
context:
space:
mode:
Diffstat (limited to 'base/debug/trace_event.h')
-rw-r--r--base/debug/trace_event.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h
index 686bd38..dcb332d 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()) {