From 18fbc316eebea9db2d7ec41e161c0a3fbb09fa42 Mon Sep 17 00:00:00 2001 From: "alkondratenko@gmail.com" Date: Wed, 31 Jul 2013 04:02:19 +0000 Subject: 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 --- src/stack_trace_table.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(0); + out[idx++] = NULL; ASSERT(idx == out_len); // Clear state -- cgit v1.2.1