diff options
| author | mostynb <mostynb@opera.com> | 2015-07-24 15:35:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-24 22:36:25 +0000 |
| commit | 5e17dd65b9bee51dc12bba6d3c5df99e14bf3f85 (patch) | |
| tree | a602c9198b78a13f8a19ebd3bbb522884cb86ea7 /third_party/tcmalloc | |
| parent | 137023cb30dae07cb821c8059c3571e943cb116d (diff) | |
| download | chromium_src-5e17dd65b9bee51dc12bba6d3c5df99e14bf3f85.zip chromium_src-5e17dd65b9bee51dc12bba6d3c5df99e14bf3f85.tar.gz chromium_src-5e17dd65b9bee51dc12bba6d3c5df99e14bf3f85.tar.bz2 | |
stray c++11 ud suffix fixes for tcmalloc files
Followup to https://codereview.chromium.org/21157004 - here are a few
more warnings that we can silence.
BUG=263960
Review URL: https://codereview.chromium.org/1253873003
Cr-Commit-Position: refs/heads/master@{#340357}
Diffstat (limited to 'third_party/tcmalloc')
| -rw-r--r-- | third_party/tcmalloc/chromium/src/base/sysinfo.cc | 2 | ||||
| -rw-r--r-- | third_party/tcmalloc/chromium/src/debugallocation.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/third_party/tcmalloc/chromium/src/base/sysinfo.cc b/third_party/tcmalloc/chromium/src/base/sysinfo.cc index e16d65a..4c81ad9 100644 --- a/third_party/tcmalloc/chromium/src/base/sysinfo.cc +++ b/third_party/tcmalloc/chromium/src/base/sysinfo.cc @@ -906,7 +906,7 @@ bool ProcMapsIterator::NextExt(uint64 *start, uint64 *end, char **flags, // start end resident privateresident obj(?) prot refcnt shadowcnt // flags copy_on_write needs_copy type filename: // 0x8048000 0x804a000 2 0 0xc104ce70 r-x 1 0 0x0 COW NC vnode /bin/cat - if (sscanf(stext_, "0x%"SCNx64" 0x%"SCNx64" %*d %*d %*p %3s %*d %*d 0x%*x %*s %*s %*s %n", + if (sscanf(stext_, "0x%" SCNx64 " 0x%" SCNx64 " %*d %*d %*p %3s %*d %*d 0x%*x %*s %*s %*s %n", start ? start : &tmpstart, end ? end : &tmpend, flags_, diff --git a/third_party/tcmalloc/chromium/src/debugallocation.cc b/third_party/tcmalloc/chromium/src/debugallocation.cc index 6a4f286..96fcb25 100644 --- a/third_party/tcmalloc/chromium/src/debugallocation.cc +++ b/third_party/tcmalloc/chromium/src/debugallocation.cc @@ -486,7 +486,7 @@ class MallocBlock { // the address space could take more. static size_t max_size_t = ~0; if (size > max_size_t - sizeof(MallocBlock)) { - RAW_LOG(ERROR, "Massive size passed to malloc: %"PRIuS"", size); + RAW_LOG(ERROR, "Massive size passed to malloc: %" PRIuS "", size); return NULL; } MallocBlock* b = NULL; @@ -965,7 +965,7 @@ static SpinLock malloc_trace_lock(SpinLock::LINKER_INITIALIZED); do { \ if (FLAGS_malloctrace) { \ SpinLockHolder l(&malloc_trace_lock); \ - TracePrintf(TraceFd(), "%s\t%"PRIuS"\t%p\t%"GPRIuPTHREAD, \ + TracePrintf(TraceFd(), "%s\t%" PRIuS "\t%p\t%" GPRIuPTHREAD, \ name, size, addr, PRINTABLE_PTHREAD(pthread_self())); \ TraceStack(); \ TracePrintf(TraceFd(), "\n"); \ @@ -1227,7 +1227,7 @@ extern "C" PERFTOOLS_DLL_DECL void* tc_new(size_t size) { void* ptr = debug_cpp_alloc(size, MallocBlock::kNewType, false); MallocHook::InvokeNewHook(ptr, size); if (ptr == NULL) { - RAW_LOG(FATAL, "Unable to allocate %"PRIuS" bytes: new failed.", size); + RAW_LOG(FATAL, "Unable to allocate %" PRIuS " bytes: new failed.", size); } return ptr; } @@ -1254,7 +1254,7 @@ extern "C" PERFTOOLS_DLL_DECL void* tc_newarray(size_t size) { void* ptr = debug_cpp_alloc(size, MallocBlock::kArrayNewType, false); MallocHook::InvokeNewHook(ptr, size); if (ptr == NULL) { - RAW_LOG(FATAL, "Unable to allocate %"PRIuS" bytes: new[] failed.", size); + RAW_LOG(FATAL, "Unable to allocate %" PRIuS " bytes: new[] failed.", size); } return ptr; } |