Commit 09a2d441 authored by jbates@chromium.org's avatar jbates@chromium.org

Fix Aura build break.

TBR=avi

Review URL: http://codereview.chromium.org/8772049

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112727 0039d316-1c4b-4281-b951-d872f2087c98
parent 1e1f7378
...@@ -639,7 +639,7 @@ class BASE_EXPORT TraceValue { ...@@ -639,7 +639,7 @@ class BASE_EXPORT TraceValue {
// same pointer is used on different processes. // same pointer is used on different processes.
class BASE_EXPORT TraceID { class BASE_EXPORT TraceID {
public: public:
TraceID() : data_(NULL) {} TraceID() : data_(0u) {}
TraceID(void* rhs); TraceID(void* rhs);
TraceID(unsigned long long rhs) : data_(static_cast<uint64>(rhs)) {} TraceID(unsigned long long rhs) : data_(static_cast<uint64>(rhs)) {}
TraceID(unsigned long rhs) : data_(static_cast<uint64>(rhs)) {} TraceID(unsigned long rhs) : data_(static_cast<uint64>(rhs)) {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment