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

Fixed ParameterList placement new conflicting with MLT 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

5
include/Nazara/Debug.hpp
View File

@ -2,7 +2,4 @@
// This file is part of the "Nazara Engine"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
#define delete NzMemoryManager::NextFree(__FILE__, __LINE__), delete
#define new new(__FILE__, __LINE__)
#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>

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

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

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

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

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

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

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

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

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

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

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

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

4
src/Nazara/Audio/Debug/Leaks.cpp
View File

@ -4,6 +4,9 @@
#include <Nazara/Audio/Config.hpp>
#if NAZARA_AUDIO_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
#define NAZARA_DEBUG_MEMORYLEAKTRACKER_DISABLE_REDEFINITION
#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
#include <new>
@ -26,4 +29,5 @@ void operator delete[](void* pointer) noexcept
{
NzMemoryManager::Free(pointer, true);
}
#endif

3
src/Nazara/Core/Debug/Leaks.cpp
View File

@ -4,6 +4,9 @@
#include <Nazara/Core/Config.hpp>
#if NAZARA_CORE_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
#define NAZARA_DEBUG_MEMORYLEAKTRACKER_DISABLE_REDEFINITION
#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
#include <new>

3
src/Nazara/Core/ParameterList.cpp
View File

@ -2,6 +2,9 @@
// This file is part of the "Nazara Engine - Core module"
// For conditions of distribution and use, see copyright notice in Config.hpp
// Notre utilisation du placement new n'est pas (encore ?) compatible avec les définitions du MLT
#define NAZARA_DEBUG_MEMORYLEAKTRACKER_DISABLE_REDEFINITION
#include <Nazara/Core/ParameterList.hpp>
#include <Nazara/Core/Error.hpp>
#include <cstring>

4
src/Nazara/Graphics/Debug/Leaks.cpp
View File

@ -4,6 +4,9 @@
#include <Nazara/Graphics/Config.hpp>
#if NAZARA_GRAPHICS_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
#define NAZARA_DEBUG_MEMORYLEAKTRACKER_DISABLE_REDEFINITION
#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
#include <new>
@ -26,4 +29,5 @@ void operator delete[](void* pointer) noexcept
{
NzMemoryManager::Free(pointer, true);
}
#endif

6
src/Nazara/Lua/Debug/Leaks.cpp
View File

@ -1,9 +1,12 @@
// Copyright (C) 2014 Jérôme Leclercq
// This file is part of the "Nazara Engine - Lua scripting module"
// This file is part of the "Nazara Engine - Lua module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Lua/Config.hpp>
#if NAZARA_LUA_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
#define NAZARA_DEBUG_MEMORYLEAKTRACKER_DISABLE_REDEFINITION
#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
#include <new>
@ -26,4 +29,5 @@ void operator delete[](void* pointer) noexcept
{
NzMemoryManager::Free(pointer, true);
}
#endif

5
src/Nazara/Noise/Debug/Leaks.cpp
View File

@ -1,9 +1,12 @@
// Copyright (C) 2014 Rémi Bèges
// Copyright (C) 2014 Jérôme Leclercq
// This file is part of the "Nazara Engine - Noise module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Noise/Config.hpp>
#if NAZARA_NOISE_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
#define NAZARA_DEBUG_MEMORYLEAKTRACKER_DISABLE_REDEFINITION
#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
#include <new>

4
src/Nazara/Physics/Debug/Leaks.cpp
View File

@ -4,6 +4,9 @@
#include <Nazara/Physics/Config.hpp>
#if NAZARA_PHYSICS_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
#define NAZARA_DEBUG_MEMORYLEAKTRACKER_DISABLE_REDEFINITION
#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
#include <new>
@ -26,4 +29,5 @@ void operator delete[](void* pointer) noexcept
{
NzMemoryManager::Free(pointer, true);
}
#endif

4
src/Nazara/Renderer/Debug/Leaks.cpp
View File

@ -4,6 +4,9 @@
#include <Nazara/Renderer/Config.hpp>
#if NAZARA_RENDERER_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
#define NAZARA_DEBUG_MEMORYLEAKTRACKER_DISABLE_REDEFINITION
#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
#include <new>
@ -26,4 +29,5 @@ void operator delete[](void* pointer) noexcept
{
NzMemoryManager::Free(pointer, true);
}
#endif

4
src/Nazara/Utility/Debug/Leaks.cpp
View File

@ -4,6 +4,9 @@
#include <Nazara/Utility/Config.hpp>
#if NAZARA_UTILITY_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
#define NAZARA_DEBUG_MEMORYLEAKTRACKER_DISABLE_REDEFINITION
#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
#include <new>
@ -26,4 +29,5 @@ void operator delete[](void* pointer) noexcept
{
NzMemoryManager::Free(pointer, true);
}
#endif