Landing http://codereview.chromium.org/7033062/:

Landing http://codereview.chromium.org/7033062/:
Replaced ptrdiff_t with std::ptrdiff_t in all files.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=88328

[Alexander Potapenko, 2011-06-08 13:12:12]

TBR

[willchan no longer on Chromium, 2011-06-08 13:12:41]

LGTM

On Wed, Jun 8, 2011 at 4:12 PM,  <glider@chromium.org> wrote:
> Reviewers: willchan,
>
> Message:
> TBR
>
> Description:
> Landing http://codereview.chromium.org/7033062/:
> Replaced ptrdiff_t with std::ptrdiff_t in all files.
>
> Please review this at http://codereview.chromium.org/7046043/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     third_party/tcmalloc/chromium/src/base/stl_allocator.h
>  M     third_party/tcmalloc/chromium/src/base/vdso_support.cc
>  M     third_party/tcmalloc/chromium/src/google/malloc_hook.h
>  M     third_party/tcmalloc/chromium/src/google/malloc_hook_c.h
>  M     third_party/tcmalloc/chromium/src/heap-checker.cc
>  M     third_party/tcmalloc/chromium/src/heap-profiler.cc
>  M     third_party/tcmalloc/chromium/src/malloc_hook-inl.h
>  M     third_party/tcmalloc/chromium/src/malloc_hook.cc
>  M     third_party/tcmalloc/chromium/src/memory_region_map.h
>  M     third_party/tcmalloc/chromium/src/memory_region_map.cc
>  M     third_party/tcmalloc/chromium/src/symbolize.h
>  M     third_party/tcmalloc/chromium/src/system-alloc.cc
>  M     third_party/tcmalloc/chromium/src/windows/port.cc
>
>
> Index: third_party/tcmalloc/chromium/src/base/stl_allocator.h
> ===================================================================
> --- third_party/tcmalloc/chromium/src/base/stl_allocator.h      (revision
> 88314)
> +++ third_party/tcmalloc/chromium/src/base/stl_allocator.h      (working
> copy)
> @@ -59,7 +59,7 @@
>  class STL_Allocator {
>  public:
>   typedef size_t     size_type;
> -  typedef ptrdiff_t  difference_type;
> +  typedef std::ptrdiff_t  difference_type;
>   typedef T*         pointer;
>   typedef const T*   const_pointer;
>   typedef T&         reference;
> Index: third_party/tcmalloc/chromium/src/base/vdso_support.cc
> ===================================================================
> --- third_party/tcmalloc/chromium/src/base/vdso_support.cc      (revision
> 88314)
> +++ third_party/tcmalloc/chromium/src/base/vdso_support.cc      (working
> copy)
> @@ -261,7 +261,7 @@
>     Init(0);
>     return;
>   }
> -  ptrdiff_t relocation =
> +  std::ptrdiff_t relocation =
>       base_as_char - reinterpret_cast<const char *>(link_base_);
>   ElfW(Dyn) *dynamic_entry =
>       reinterpret_cast<ElfW(Dyn) *>(dynamic_program_header->p_vaddr +
> Index: third_party/tcmalloc/chromium/src/google/malloc_hook.h
> ===================================================================
> --- third_party/tcmalloc/chromium/src/google/malloc_hook.h      (revision
> 88314)
> +++ third_party/tcmalloc/chromium/src/google/malloc_hook.h      (working
> copy)
> @@ -169,7 +169,7 @@
>   inline static PreSbrkHook SetPreSbrkHook(PreSbrkHook hook) {
>     return MallocHook_SetPreSbrkHook(hook);
>   }
> -  inline static void InvokePreSbrkHook(ptrdiff_t increment);
> +  inline static void InvokePreSbrkHook(std::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
> @@ -180,7 +180,7 @@
>   inline static SbrkHook SetSbrkHook(SbrkHook hook) {
>     return MallocHook_SetSbrkHook(hook);
>   }
> -  inline static void InvokeSbrkHook(const void* result, ptrdiff_t
> increment);
> +  inline static void InvokeSbrkHook(const void* result, std::ptrdiff_t
> increment);
>
>   // Get the current stack trace.  Try to skip all routines up to and
>   // and including the caller of MallocHook::Invoke*.
> Index: third_party/tcmalloc/chromium/src/google/malloc_hook_c.h
> ===================================================================
> --- third_party/tcmalloc/chromium/src/google/malloc_hook_c.h    (revision
> 88314)
> +++ third_party/tcmalloc/chromium/src/google/malloc_hook_c.h    (working
> copy)
> @@ -84,10 +84,10 @@
>                                       const void* new_addr);
>  MallocHook_MremapHook MallocHook_SetMremapHook(MallocHook_MremapHook hook);
>
> -typedef void (*MallocHook_PreSbrkHook)(ptrdiff_t increment);
> +typedef void (*MallocHook_PreSbrkHook)(std::ptrdiff_t increment);
>  MallocHook_PreSbrkHook MallocHook_SetPreSbrkHook(MallocHook_PreSbrkHook
> hook);
>
> -typedef void (*MallocHook_SbrkHook)(const void* result, ptrdiff_t
> increment);
> +typedef void (*MallocHook_SbrkHook)(const void* result, std::ptrdiff_t
> increment);
>  MallocHook_SbrkHook MallocHook_SetSbrkHook(MallocHook_SbrkHook hook);
>
>  #endif /* _MALLOC_HOOK_C_H_ */
> Index: third_party/tcmalloc/chromium/src/heap-checker.cc
> ===================================================================
> --- third_party/tcmalloc/chromium/src/heap-checker.cc   (revision 88314)
> +++ third_party/tcmalloc/chromium/src/heap-checker.cc   (working copy)
> @@ -2133,7 +2133,7 @@
>  }
>
>  // Important to have this to catch the first sbrk call (say from tcmalloc):
> -extern void InitialMallocHook_Sbrk(const void* result, ptrdiff_t increment)
> {
> +extern void InitialMallocHook_Sbrk(const void* result, std::ptrdiff_t
> increment) {
>   InitHeapLeakCheckerFromMallocHook();
>   // record this first sbrk as well (if we need to):
>   MallocHook::InvokeSbrkHook(result, increment);
> Index: third_party/tcmalloc/chromium/src/heap-profiler.cc
> ===================================================================
> --- third_party/tcmalloc/chromium/src/heap-profiler.cc  (revision 88314)
> +++ third_party/tcmalloc/chromium/src/heap-profiler.cc  (working copy)
> @@ -437,7 +437,7 @@
>   }
>  }
>
> -static void SbrkHook(const void* result, ptrdiff_t increment) {
> +static void SbrkHook(const void* result, std::ptrdiff_t increment) {
>   if (FLAGS_mmap_log) {  // log it
>     RAW_LOG(INFO, "sbrk(inc=%"PRIdS") = 0x%"PRIxPTR"",
>                   increment, (uintptr_t) result);
> Index: third_party/tcmalloc/chromium/src/malloc_hook-inl.h
> ===================================================================
> --- third_party/tcmalloc/chromium/src/malloc_hook-inl.h (revision 88314)
> +++ third_party/tcmalloc/chromium/src/malloc_hook-inl.h (working copy)
> @@ -170,7 +170,7 @@
>   return base::internal::presbrk_hook_.Get();
>  }
>
> -inline void MallocHook::InvokePreSbrkHook(ptrdiff_t increment) {
> +inline void MallocHook::InvokePreSbrkHook(std::ptrdiff_t increment) {
>   MallocHook::PreSbrkHook hook = MallocHook::GetPreSbrkHook();
>   if (hook != NULL && increment != 0) (*hook)(increment);
>  }
> @@ -180,7 +180,7 @@
>  }
>
>  inline void MallocHook::InvokeSbrkHook(const void* result,
> -                                       ptrdiff_t increment) {
> +                                       std::ptrdiff_t increment) {
>   MallocHook::SbrkHook hook = MallocHook::GetSbrkHook();
>   if (hook != NULL && increment != 0) (*hook)(result, increment);
>  }
> Index: third_party/tcmalloc/chromium/src/malloc_hook.cc
> ===================================================================
> --- third_party/tcmalloc/chromium/src/malloc_hook.cc    (revision 88314)
> +++ third_party/tcmalloc/chromium/src/malloc_hook.cc    (working copy)
> @@ -102,10 +102,10 @@
>                                    off_t offset);
>
>  ATTRIBUTE_WEAK
> -extern void InitialMallocHook_PreSbrk(ptrdiff_t increment);
> +extern void InitialMallocHook_PreSbrk(std::ptrdiff_t increment);
>
>  ATTRIBUTE_WEAK
> -extern void InitialMallocHook_Sbrk(const void* result, ptrdiff_t
> increment);
> +extern void InitialMallocHook_Sbrk(const void* result, std::ptrdiff_t
> increment);
>
>  namespace base { namespace internal {
>  template<typename PtrT>
> @@ -240,12 +240,12 @@
>     MallocHook::SetMmapHook(NULL);
>  }
>
> -void InitialMallocHook_PreSbrk(ptrdiff_t increment) {
> +void InitialMallocHook_PreSbrk(std::ptrdiff_t increment) {
>   if (MallocHook::GetPreSbrkHook() == &InitialMallocHook_PreSbrk)
>     MallocHook::SetPreSbrkHook(NULL);
>  }
>
> -void InitialMallocHook_Sbrk(const void* result, ptrdiff_t increment) {
> +void InitialMallocHook_Sbrk(const void* result, std::ptrdiff_t increment) {
>   if (MallocHook::GetSbrkHook() == &InitialMallocHook_Sbrk)
>     MallocHook::SetSbrkHook(NULL);
>  }
> @@ -449,7 +449,7 @@
>   void* mremap(void* old_addr, size_t old_size, size_t new_size,
>                int flags, ...) __THROW
>     ATTRIBUTE_SECTION(malloc_hook);
> -  void* sbrk(ptrdiff_t increment) __THROW
> +  void* sbrk(std::ptrdiff_t increment) __THROW
>     ATTRIBUTE_SECTION(malloc_hook);
>  }
>
> @@ -492,9 +492,9 @@
>  }
>
>  // libc's version:
> -extern "C" void* __sbrk(ptrdiff_t increment);
> +extern "C" void* __sbrk(std::ptrdiff_t increment);
>
> -extern "C" void* sbrk(ptrdiff_t increment) __THROW {
> +extern "C" void* sbrk(std::ptrdiff_t increment) __THROW {
>   MallocHook::InvokePreSbrkHook(increment);
>   void *result = __sbrk(increment);
>   MallocHook::InvokeSbrkHook(result, increment);
> Index: third_party/tcmalloc/chromium/src/memory_region_map.cc
> ===================================================================
> --- third_party/tcmalloc/chromium/src/memory_region_map.cc      (revision
> 88314)
> +++ third_party/tcmalloc/chromium/src/memory_region_map.cc      (working
> copy)
> @@ -628,9 +628,9 @@
>   }
>  }
>
> -extern "C" void* __sbrk(ptrdiff_t increment);  // defined in libc
> +extern "C" void* __sbrk(std::ptrdiff_t increment);  // defined in libc
>
> -void MemoryRegionMap::SbrkHook(const void* result, ptrdiff_t increment) {
> +void MemoryRegionMap::SbrkHook(const void* result, std::ptrdiff_t
> increment) {
>   RAW_VLOG(10, "Sbrk = 0x%"PRIxPTR" of %"PRIdS"", (uintptr_t)result,
> increment);
>   if (result != reinterpret_cast<void*>(-1)) {
>     if (increment > 0) {
> Index: third_party/tcmalloc/chromium/src/memory_region_map.h
> ===================================================================
> --- third_party/tcmalloc/chromium/src/memory_region_map.h       (revision
> 88314)
> +++ third_party/tcmalloc/chromium/src/memory_region_map.h       (working
> copy)
> @@ -323,7 +323,7 @@
>   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, ptrdiff_t increment);
> +  static void SbrkHook(const void* result, std::ptrdiff_t increment);
>
>   // Log all memory regions; Useful for debugging only.
>   // Assumes Lock() is held
> Index: third_party/tcmalloc/chromium/src/symbolize.h
> ===================================================================
> --- third_party/tcmalloc/chromium/src/symbolize.h       (revision 88314)
> +++ third_party/tcmalloc/chromium/src/symbolize.h       (working copy)
> @@ -35,6 +35,7 @@
>
>  #include "config.h"
>  #ifdef HAVE_STDINT_H
> +#include <stddef.h>
>  #include <stdint.h>  // for uintptr_t
>  #endif
>  #include <map>
> Index: third_party/tcmalloc/chromium/src/system-alloc.cc
> ===================================================================
> --- third_party/tcmalloc/chromium/src/system-alloc.cc   (revision 88314)
> +++ third_party/tcmalloc/chromium/src/system-alloc.cc   (working copy)
> @@ -166,7 +166,7 @@
>
>   // sbrk will release memory if passed a negative number, so we do
>   // a strict check here
> -  if (static_cast<ptrdiff_t>(size + alignment) < 0) return NULL;
> +  if (static_cast<std::ptrdiff_t>(size + alignment) < 0) return NULL;
>
>   // This doesn't overflow because TCMalloc_SystemAlloc has already
>   // tested for overflow at the alignment boundary.
> Index: third_party/tcmalloc/chromium/src/windows/port.cc
> ===================================================================
> --- third_party/tcmalloc/chromium/src/windows/port.cc   (revision 88314)
> +++ third_party/tcmalloc/chromium/src/windows/port.cc   (working copy)
> @@ -77,7 +77,7 @@
>   return pagesize;
>  }
>
> -extern "C" PERFTOOLS_DLL_DECL void* __sbrk(ptrdiff_t increment) {
> +extern "C" PERFTOOLS_DLL_DECL void* __sbrk(std::ptrdiff_t increment) {
>   LOG(FATAL, "Windows doesn't implement sbrk!\n");
>   return NULL;
>  }
>
>
>