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

Core/MemoryPool: Fix incorrect inlines

This commit is contained in:
Jérôme Leclercq 2017-01-25 15:53:25 +01:00
parent a18389c48e
commit 28965b799e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Core/MemoryPool.hpp
View File

@ -22,12 +22,14 @@ namespace Nz
~MemoryPool() = default; ~MemoryPool() = default;
void* Allocate(unsigned int size); void* Allocate(unsigned int size);
template<typename T> void Delete(T* ptr); template<typename T> void Delete(T* ptr);
void Free(void* ptr); void Free(void* ptr);
unsigned int GetBlockSize() const; inline unsigned int GetBlockSize() const;
unsigned int GetFreeBlocks() const; inline unsigned int GetFreeBlocks() const;
unsigned int GetSize() const; inline unsigned int GetSize() const;
template<typename T, typename... Args> T* New(Args&&... args); template<typename T, typename... Args> T* New(Args&&... args);

4
include/Nazara/Core/MemoryPool.inl
View File

@ -2,6 +2,7 @@
// This file is part of the "Nazara Engine - Core module" // This file is part of the "Nazara Engine - Core module"
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/MemoryPool.hpp>
#include <Nazara/Core/MemoryHelper.hpp> #include <Nazara/Core/MemoryHelper.hpp>
#include <utility> #include <utility>
#include <stdexcept> #include <stdexcept>
@ -95,9 +96,8 @@ namespace Nz
* *
* \remark If ptr is null, nothing is done * \remark If ptr is null, nothing is done
*/ */
template<typename T> template<typename T>
inline void MemoryPool::Delete(T* ptr) void MemoryPool::Delete(T* ptr)
{ {
if (ptr) if (ptr)
{ {