| Index: base/trace_event.cc
|
| diff --git a/base/trace_event.cc b/base/trace_event.cc
|
| index be2fbaa4fcd9584a663a0f393c1c522fb21ddaea..13c0c2cd82213df237a8801f65240c60a437f098 100644
|
| --- a/base/trace_event.cc
|
| +++ b/base/trace_event.cc
|
| @@ -133,10 +133,10 @@ void TraceLog::Trace(const std::string& name,
|
| int64 usec = delta.InMicroseconds();
|
| std::string msg =
|
| StringPrintf("{'pid':'0x%lx', 'tid':'0x%lx', 'type':'%s', "
|
| - "'name':'%s', 'id':'0x%lx', 'extra':'%s', 'file':'%s', "
|
| + "'name':'%s', 'id':'%p', 'extra':'%s', 'file':'%s', "
|
| "'line_number':'%d', 'usec_begin': %" PRId64 "},\n",
|
| - base::GetCurrentProcId(),
|
| - PlatformThread::CurrentId(),
|
| + static_cast<unsigned long>(base::GetCurrentProcId()),
|
| + static_cast<unsigned long>(PlatformThread::CurrentId()),
|
| kEventTypeNames[type],
|
| name.c_str(),
|
| id,
|
|
|