diff options
| author | alkondratenko@gmail.com <alkondratenko@gmail.com@6b5cf1ce-ec42-a296-1ba9-69fdba395a50> | 2013-07-31 04:02:19 +0000 |
|---|---|---|
| committer | alkondratenko@gmail.com <alkondratenko@gmail.com@6b5cf1ce-ec42-a296-1ba9-69fdba395a50> | 2013-07-31 04:02:19 +0000 |
| commit | 18fbc316eebea9db2d7ec41e161c0a3fbb09fa42 (patch) | |
| tree | dbb069dce4ae504d2f43248651dc21ea196d4c41 | |
| parent | 674fcd94a8a0a3595f64e13762ba3a6529e09926 (diff) | |
| download | gperftools-18fbc316eebea9db2d7ec41e161c0a3fbb09fa42.tar.gz | |
Fix a C++11 error.
This merges patch by Nico Weber.
New clang versions complain in C++11 mode that:
error: cannot initialize a variable of type 'void *' with an rvalue of type 'uintptr_t' (aka 'unsigned long')
This same change was done for the google-internal version of tcmalloc too.
Reviewed-at: https://codereview.appspot.com/12132043
git-svn-id: http://gperftools.googlecode.com/svn/trunk@238 6b5cf1ce-ec42-a296-1ba9-69fdba395a50
| -rw-r--r-- | src/stack_trace_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/stack_trace_table.cc b/src/stack_trace_table.cc index d258a4f..76a032a 100644 --- a/src/stack_trace_table.cc +++ b/src/stack_trace_table.cc @@ -135,7 +135,7 @@ void** StackTraceTable::ReadStackTracesAndClear() { b = b->next; } } - out[idx++] = static_cast<uintptr_t>(0); + out[idx++] = NULL; ASSERT(idx == out_len); // Clear state |