| Index: base/debug/trace_event.h
|
| diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h
|
| index c6d62bce79ce521425844c8423cab35a3bcd1f0a..8996a581595a9792ed28bf0ac3e1c3d71383e122 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)) {}
|
|
|