diff options
11 files changed, 20 insertions, 20 deletions
diff --git a/third_party/tcmalloc/chromium/src/base/stl_allocator.h b/third_party/tcmalloc/chromium/src/base/stl_allocator.h index f7adb68..8276a83 100644 --- a/third_party/tcmalloc/chromium/src/base/stl_allocator.h +++ b/third_party/tcmalloc/chromium/src/base/stl_allocator.h @@ -37,7 +37,7 @@ #include <config.h> -#include <stddef.h> // for std::ptrdiff_t +#include <stddef.h> // for ptrdiff_t #include <limits> #include "base/logging.h" @@ -59,7 +59,7 @@ template <typename T, class Alloc> class STL_Allocator { public: typedef size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef ptrdiff_t difference_type; typedef T* pointer; typedef const T* const_pointer; typedef T& reference; diff --git a/third_party/tcmalloc/chromium/src/base/vdso_support.cc b/third_party/tcmalloc/chromium/src/base/vdso_support.cc index c98d9fa..767ee5f 100644 --- a/third_party/tcmalloc/chromium/src/base/vdso_support.cc +++ b/third_party/tcmalloc/chromium/src/base/vdso_support.cc @@ -40,7 +40,7 @@ #ifdef HAVE_VDSO_SUPPORT // defined in vdso_support.h #include <fcntl.h> -#include <stddef.h> // for std::ptrdiff_t +#include <stddef.h> // for ptrdiff_t #include "base/atomicops.h" // for MemoryBarrier #include "base/linux_syscall_support.h" diff --git a/third_party/tcmalloc/chromium/src/gperftools/malloc_hook.h b/third_party/tcmalloc/chromium/src/gperftools/malloc_hook.h index 673a3f3..b99c047 100644 --- a/third_party/tcmalloc/chromium/src/gperftools/malloc_hook.h +++ b/third_party/tcmalloc/chromium/src/gperftools/malloc_hook.h @@ -237,7 +237,7 @@ class PERFTOOLS_DLL_DECL MallocHook { inline static bool RemovePreSbrkHook(PreSbrkHook hook) { return MallocHook_RemovePreSbrkHook(hook); } - inline static void InvokePreSbrkHook(std::ptrdiff_t increment); + inline static void InvokePreSbrkHook(ptrdiff_t increment); // The SbrkHook is invoked whenever sbrk is called -- except when // the increment is 0. This is because sbrk(0) is often called @@ -250,7 +250,7 @@ class PERFTOOLS_DLL_DECL MallocHook { inline static bool RemoveSbrkHook(SbrkHook hook) { return MallocHook_RemoveSbrkHook(hook); } - inline static void InvokeSbrkHook(const void* result, std::ptrdiff_t increment); + inline static void InvokeSbrkHook(const void* result, ptrdiff_t increment); // Get the current stack trace. Try to skip all routines up to and // and including the caller of MallocHook::Invoke*. @@ -346,8 +346,8 @@ class PERFTOOLS_DLL_DECL MallocHook { size_t new_size, int flags, const void* new_addr); - static void InvokePreSbrkHookSlow(std::ptrdiff_t increment); - static void InvokeSbrkHookSlow(const void* result, std::ptrdiff_t increment); + static void InvokePreSbrkHookSlow(ptrdiff_t increment); + static void InvokeSbrkHookSlow(const void* result, ptrdiff_t increment); }; #ifdef _MSC_VER diff --git a/third_party/tcmalloc/chromium/src/gperftools/malloc_hook_c.h b/third_party/tcmalloc/chromium/src/gperftools/malloc_hook_c.h index b8478c1..56337e1 100644 --- a/third_party/tcmalloc/chromium/src/gperftools/malloc_hook_c.h +++ b/third_party/tcmalloc/chromium/src/gperftools/malloc_hook_c.h @@ -135,13 +135,13 @@ int MallocHook_AddMremapHook(MallocHook_MremapHook hook); PERFTOOLS_DLL_DECL int MallocHook_RemoveMremapHook(MallocHook_MremapHook hook); -typedef void (*MallocHook_PreSbrkHook)(std::ptrdiff_t increment); +typedef void (*MallocHook_PreSbrkHook)(ptrdiff_t increment); PERFTOOLS_DLL_DECL int MallocHook_AddPreSbrkHook(MallocHook_PreSbrkHook hook); PERFTOOLS_DLL_DECL int MallocHook_RemovePreSbrkHook(MallocHook_PreSbrkHook hook); -typedef void (*MallocHook_SbrkHook)(const void* result, std::ptrdiff_t increment); +typedef void (*MallocHook_SbrkHook)(const void* result, ptrdiff_t increment); PERFTOOLS_DLL_DECL int MallocHook_AddSbrkHook(MallocHook_SbrkHook hook); PERFTOOLS_DLL_DECL diff --git a/third_party/tcmalloc/chromium/src/heap-profiler.cc b/third_party/tcmalloc/chromium/src/heap-profiler.cc index 090f259..c86a3c2 100644 --- a/third_party/tcmalloc/chromium/src/heap-profiler.cc +++ b/third_party/tcmalloc/chromium/src/heap-profiler.cc @@ -466,7 +466,7 @@ static void MunmapHook(const void* ptr, size_t size) { } } -static void SbrkHook(const void* result, std::ptrdiff_t increment) { +static void SbrkHook(const void* result, ptrdiff_t increment) { if (FLAGS_mmap_log) { // log it RAW_LOG(INFO, "sbrk(inc=%"PRIdS") = 0x%"PRIxPTR"", increment, (uintptr_t) result); diff --git a/third_party/tcmalloc/chromium/src/malloc_hook-inl.h b/third_party/tcmalloc/chromium/src/malloc_hook-inl.h index 7c783bf..27e5bdc 100644 --- a/third_party/tcmalloc/chromium/src/malloc_hook-inl.h +++ b/third_party/tcmalloc/chromium/src/malloc_hook-inl.h @@ -293,7 +293,7 @@ inline MallocHook::PreSbrkHook MallocHook::GetPreSbrkHook() { return base::internal::presbrk_hook_.Get(); } -inline void MallocHook::InvokePreSbrkHook(std::ptrdiff_t increment) { +inline void MallocHook::InvokePreSbrkHook(ptrdiff_t increment) { if (!base::internal::presbrk_hooks_.empty() && increment != 0) { InvokePreSbrkHookSlow(increment); } @@ -309,7 +309,7 @@ inline MallocHook::SbrkHook MallocHook::GetSbrkHook() { } inline void MallocHook::InvokeSbrkHook(const void* result, - std::ptrdiff_t increment) { + ptrdiff_t increment) { if (!base::internal::sbrk_hooks_.empty() && increment != 0) { InvokeSbrkHookSlow(result, increment); } diff --git a/third_party/tcmalloc/chromium/src/malloc_hook.cc b/third_party/tcmalloc/chromium/src/malloc_hook.cc index 5d6b336..2f8608e 100644 --- a/third_party/tcmalloc/chromium/src/malloc_hook.cc +++ b/third_party/tcmalloc/chromium/src/malloc_hook.cc @@ -127,7 +127,7 @@ void InitialPreMMapHook(const void* start, MallocHook::InvokePreMmapHook(start, size, protection, flags, fd, offset); } -void InitialPreSbrkHook(std::ptrdiff_t increment) { +void InitialPreSbrkHook(ptrdiff_t increment) { perftools_pthread_once(&once, &RemoveInitialHooksAndCallInitializers); MallocHook::InvokePreSbrkHook(increment); } @@ -581,11 +581,11 @@ void MallocHook::InvokeMremapHookSlow(const void* result, flags, new_addr)); } -void MallocHook::InvokePreSbrkHookSlow(std::ptrdiff_t increment) { +void MallocHook::InvokePreSbrkHookSlow(ptrdiff_t increment) { INVOKE_HOOKS(PreSbrkHook, presbrk_hooks_, (increment)); } -void MallocHook::InvokeSbrkHookSlow(const void* result, std::ptrdiff_t increment) { +void MallocHook::InvokeSbrkHookSlow(const void* result, ptrdiff_t increment) { INVOKE_HOOKS(SbrkHook, sbrk_hooks_, (result, increment)); } diff --git a/third_party/tcmalloc/chromium/src/memory_region_map.cc b/third_party/tcmalloc/chromium/src/memory_region_map.cc index 85095bf..1a81172 100644 --- a/third_party/tcmalloc/chromium/src/memory_region_map.cc +++ b/third_party/tcmalloc/chromium/src/memory_region_map.cc @@ -618,9 +618,9 @@ void MemoryRegionMap::MremapHook(const void* result, } } -extern "C" void* __sbrk(std::ptrdiff_t increment); // defined in libc +extern "C" void* __sbrk(ptrdiff_t increment); // defined in libc -void MemoryRegionMap::SbrkHook(const void* result, std::ptrdiff_t increment) { +void MemoryRegionMap::SbrkHook(const void* result, ptrdiff_t increment) { RAW_VLOG(10, "Sbrk = 0x%"PRIxPTR" of %"PRIdS"", (uintptr_t)result, increment); if (result != reinterpret_cast<void*>(-1)) { if (increment > 0) { diff --git a/third_party/tcmalloc/chromium/src/memory_region_map.h b/third_party/tcmalloc/chromium/src/memory_region_map.h index 8c13fbc..988ea70 100644 --- a/third_party/tcmalloc/chromium/src/memory_region_map.h +++ b/third_party/tcmalloc/chromium/src/memory_region_map.h @@ -328,7 +328,7 @@ class MemoryRegionMap { static void MremapHook(const void* result, const void* old_addr, size_t old_size, size_t new_size, int flags, const void* new_addr); - static void SbrkHook(const void* result, std::ptrdiff_t increment); + static void SbrkHook(const void* result, ptrdiff_t increment); // Log all memory regions; Useful for debugging only. // Assumes Lock() is held diff --git a/third_party/tcmalloc/chromium/src/system-alloc.cc b/third_party/tcmalloc/chromium/src/system-alloc.cc index 511990c..b755b3f 100644 --- a/third_party/tcmalloc/chromium/src/system-alloc.cc +++ b/third_party/tcmalloc/chromium/src/system-alloc.cc @@ -210,7 +210,7 @@ void* SbrkSysAllocator::Alloc(size_t size, size_t *actual_size, // sbrk will release memory if passed a negative number, so we do // a strict check here - if (static_cast<std::ptrdiff_t>(size + alignment) < 0) return NULL; + if (static_cast<ptrdiff_t>(size + alignment) < 0) return NULL; // This doesn't overflow because TCMalloc_SystemAlloc has already // tested for overflow at the alignment boundary. diff --git a/third_party/tcmalloc/chromium/src/windows/port.cc b/third_party/tcmalloc/chromium/src/windows/port.cc index 0205912..6181bcf 100644 --- a/third_party/tcmalloc/chromium/src/windows/port.cc +++ b/third_party/tcmalloc/chromium/src/windows/port.cc @@ -61,7 +61,7 @@ int getpagesize() { return pagesize; } -extern "C" PERFTOOLS_DLL_DECL void* __sbrk(std::ptrdiff_t increment) { +extern "C" PERFTOOLS_DLL_DECL void* __sbrk(ptrdiff_t increment) { LOG(FATAL, "Windows doesn't implement sbrk!\n"); return NULL; } |