mirror of
https://bitbucket.org/theswgsource/src-1.2.git
synced 2026-08-01 02:15:54 -04:00
tidies some things up and removes SOE memory manager overriding
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
// Copyright 2002 Sony Online Entertainment
|
||||
//
|
||||
// ======================================================================
|
||||
|
||||
/*
|
||||
#include "sharedMemoryManager/FirstSharedMemoryManager.h"
|
||||
#include "sharedMemoryManager/MemoryManager.h"
|
||||
#include "sharedMemoryManager/OsNewDel.h"
|
||||
@@ -88,6 +88,6 @@ void operator delete[](void *pointer, const char *file, int line) throw()
|
||||
if (pointer)
|
||||
MemoryManager::free(pointer, true);
|
||||
}
|
||||
|
||||
*/
|
||||
// ======================================================================
|
||||
|
||||
|
||||
@@ -17,16 +17,19 @@ enum MemoryManagerNotALeak
|
||||
MM_notALeak
|
||||
};
|
||||
|
||||
/*
|
||||
void *operator new(size_t size, MemoryManagerNotALeak);
|
||||
void *operator new(size_t size);
|
||||
void *operator new[](std::size_t size);
|
||||
void *operator new(size_t size, char const *file, int line);
|
||||
void *operator new[](size_t size, char const *file, int line);
|
||||
|
||||
|
||||
void operator delete(void *pointer) throw();
|
||||
void operator delete[](void *pointer) throw();
|
||||
void operator delete(void *pointer, char const *file, int line) throw();
|
||||
void operator delete[](void *pointer, char const *file, int line) throw();
|
||||
*/
|
||||
|
||||
// ======================================================================
|
||||
|
||||
|
||||
@@ -1349,7 +1349,7 @@ void *MemoryManager::reallocate(void *userPointer, size_t newSize)
|
||||
|
||||
if (newSize <= static_cast<size_t>(oldSize))
|
||||
{
|
||||
// DEBUG_REPORT_LOG(ms_logEachAlloc, ("MemoryManager::reallocate() new_requested_size=%d, org ptr=%p, new ptr=%p\n", newSize, userPointer, userPointer));
|
||||
// DEBUG_REPORT_LOG(ms_logEachAlloc, ("realloc() new_requested_size=%d, org ptr=%p, new ptr=%p\n", newSize, userPointer, userPointer));
|
||||
|
||||
return userPointer;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user