diff options
| author | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 17:46:14 +0000 |
|---|---|---|
| committer | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 17:46:14 +0000 |
| commit | 09a2d44193268973f08e18d3e5477ae71dcbd364 (patch) | |
| tree | 26903bafabdafda0f93ac3ae8938539f9f25cd97 /base | |
| parent | 1e1f7378006bf8961ae92e3364365f84162d1878 (diff) | |
| download | chromium_src-09a2d44193268973f08e18d3e5477ae71dcbd364.zip chromium_src-09a2d44193268973f08e18d3e5477ae71dcbd364.tar.gz chromium_src-09a2d44193268973f08e18d3e5477ae71dcbd364.tar.bz2 | |
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
Diffstat (limited to 'base')
| -rw-r--r-- | base/debug/trace_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h index c6d62bc..8996a58 100644 --- a/base/debug/trace_event.h +++ b/base/debug/trace_event.h @@ -639,7 +639,7 @@ class BASE_EXPORT TraceValue { // same pointer is used on different processes. class BASE_EXPORT TraceID { public: - TraceID() : data_(NULL) {} + TraceID() : data_(0u) {} TraceID(void* rhs); TraceID(unsigned long long rhs) : data_(static_cast<uint64>(rhs)) {} TraceID(unsigned long rhs) : data_(static_cast<uint64>(rhs)) {} |