mirror of
https://github.com/gperftools/gperftools
synced 2025-02-17 20:56:53 +00:00
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
This commit is contained in:
parent
674fcd94a8
commit
18fbc316ee
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user