From 73f173dfc6b317e8d210d3363fb3179f57899fdc Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 3 Jan 2016 20:13:21 +0100 Subject: [PATCH] Fixed: Compilation with clang --- .../src/server_share/stl_allocator_checker.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/ryzom/server/src/server_share/stl_allocator_checker.cpp b/code/ryzom/server/src/server_share/stl_allocator_checker.cpp index daf9b79b6..6429967f9 100644 --- a/code/ryzom/server/src/server_share/stl_allocator_checker.cpp +++ b/code/ryzom/server/src/server_share/stl_allocator_checker.cpp @@ -24,11 +24,11 @@ #include "nel/misc/variable.h" #include "stl_allocator_checker.h" -bool EnableStlAllocatorChecker= true; -NLMISC_VARIABLE(bool,EnableStlAllocatorChecker,"Enable stl allocator tests"); +bool EnableStlAllocatorChecker = true; +NLMISC_VARIABLE(bool, EnableStlAllocatorChecker, "Enable stl allocator tests"); -uintptr_t StlAllocatorMaxFree= 0; -NLMISC_VARIABLE(uintptr_t,StlAllocatorMaxFree,"When EnableStlAllocatorChecker is true, this value gives the largest number of free blocks encountered"); +uint64 StlAllocatorMaxFree = 0; +NLMISC_VARIABLE(uint64, StlAllocatorMaxFree, "When EnableStlAllocatorChecker is true, this value gives the largest number of free blocks encountered"); // setup a 'max iterations' value of 3GBytes/ sizeof(void*) (32bit) // => this is equivalent to the total addressable memory space under linux @@ -78,8 +78,8 @@ void testStlMemoryAllocator(const char* state) // if we hit a NULL end of list terminator then return happily if (p==NULL) { - uintptr_t numIterations= MaxIterations- counter; - StlAllocatorMaxFree= std::max(numIterations,StlAllocatorMaxFree); + uintptr_t numIterations = MaxIterations - counter; + StlAllocatorMaxFree = std::max((uint64)numIterations, StlAllocatorMaxFree); signal(SIGSEGV, NULL); return; } @@ -92,8 +92,8 @@ void testStlMemoryAllocator(const char* state) } // we just hit a crash case so setup flags / globals accordingly - IsCrashed= true; - StlMemoryAllocatorCrashPoint= state; + IsCrashed = true; + StlMemoryAllocatorCrashPoint = state; signal(SIGSEGV, NULL); }