Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: third_party/tcmalloc/chromium/src/malloc_hook.cc

Issue 7033062: Replaced ptrdiff_t with std::ptrdiff_t in all files to enable build with gcc-4.6.0. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/tcmalloc/chromium/src/malloc_hook.cc
===================================================================
--- third_party/tcmalloc/chromium/src/malloc_hook.cc (revision 88058)
+++ 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);
« no previous file with comments | « third_party/tcmalloc/chromium/src/heap-profiler.cc ('k') | third_party/tcmalloc/chromium/src/malloc_hook-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698