sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed ParameterList placement new conflicting with MLT

Browse Source 
Former-commit-id: 97ca15d16e20e42427fceeea4f96a2e6b857dc83
This commit is contained in:
Lynix
2014-02-18 00:52:23 +01:00
parent 67000134f0
commit 4df6c30a26
19 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Core/Debug.hpp
View File

@@ -5,7 +5,4 @@
#include <Nazara/Core/Config.hpp>
#if NAZARA_CORE_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
#define delete NzMemoryManager::NextFree(__FILE__, __LINE__), delete
#define new new(__FILE__, __LINE__)
#endif

11
include/Nazara/Core/Debug/MemoryLeakTracker.hpp
View File

@@ -14,14 +14,14 @@
class NAZARA_API NzMemoryManager
{
public:
NzMemoryManager();
~NzMemoryManager();
static void* Allocate(std::size_t size, bool multi, const char* file = nullptr, unsigned int line = 0);
static void Free(void* pointer, bool multi);
static void NextFree(const char* file, unsigned int line);
private:
NzMemoryManager();
~NzMemoryManager();
static void Initialize();
static char* TimeInfo();
static void Uninitialize();
@@ -33,3 +33,8 @@ NAZARA_API void operator delete(void* ptr, const char* file, unsigned int line)
NAZARA_API void operator delete[](void* ptr, const char* file, unsigned int line) throw();
#endif // NAZARA_DEBUG_MEMORYLEAKTRACKER_HPP
#ifndef NAZARA_DEBUG_MEMORYLEAKTRACKER_DISABLE_REDEFINITION
#define delete NzMemoryManager::NextFree(__FILE__, __LINE__), delete
#define new new(__FILE__, __LINE__)
#endif