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

Unified Diff: base/debug/trace_event.h

Issue 374043002: Fix tracing 64-bit to 32-bit truncations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | base/debug/trace_event_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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()) {
« no previous file with comments | « no previous file | base/debug/trace_event_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698