diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-06-14 18:57:21 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-06-14 18:57:21 +0200 |
| commit | 8bf37f3dd7ff017eedaac427b9291a9335d61efc (patch) | |
| tree | f3ce368c042c0c2a1f26b5e49b8b09204fa3d341 | |
| parent | Added logging (diff) | |
| download | cuberite-8bf37f3dd7ff017eedaac427b9291a9335d61efc.tar cuberite-8bf37f3dd7ff017eedaac427b9291a9335d61efc.tar.gz cuberite-8bf37f3dd7ff017eedaac427b9291a9335d61efc.tar.bz2 cuberite-8bf37f3dd7ff017eedaac427b9291a9335d61efc.tar.lz cuberite-8bf37f3dd7ff017eedaac427b9291a9335d61efc.tar.xz cuberite-8bf37f3dd7ff017eedaac427b9291a9335d61efc.tar.zst cuberite-8bf37f3dd7ff017eedaac427b9291a9335d61efc.zip | |
| -rw-r--r-- | src/AllocationPool.h | 8 | ||||
| -rw-r--r-- | src/ChunkData.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/AllocationPool.h b/src/AllocationPool.h index 643b44a6d..b8862e7df 100644 --- a/src/AllocationPool.h +++ b/src/AllocationPool.h @@ -3,7 +3,7 @@ #include <memory> -template<class T, size_t BufferSize> +template<class T, size_t NumElementsInReserve> class cAllocationPool { public: @@ -32,14 +32,14 @@ class cAllocationPool { T* Allocate() { - if (m_FreeList.size() <= BufferSize) + if (m_FreeList.size() <= NumElementsInReserve) { void * space = malloc(sizeof(T)); if (space != NULL) { return new(space) T; } - else if (m_FreeList.size() == BufferSize) + else if (m_FreeList.size() == NumElementsInReserve) { m_Callbacks->OnStartingUsingBuffer(); } @@ -64,7 +64,7 @@ class cAllocationPool { // placement destruct. ptr->~T(); m_FreeList.push_front(ptr); - if (m_FreeList.size() == BufferSize) + if (m_FreeList.size() == NumElementsInReserve) { m_Callbacks->OnStopUsingBuffer(); } diff --git a/src/ChunkData.cpp b/src/ChunkData.cpp index 24a2c3e14..a80b1de0f 100644 --- a/src/ChunkData.cpp +++ b/src/ChunkData.cpp @@ -30,9 +30,9 @@ template <typename T> inline bool IsAllValue(const T * a_Array, size_t a_NumElem cChunkData::cChunkData(cAllocationPool<cChunkData::sChunkSection, 1600>& a_Pool) : #if __cplusplus < 201103L // auto_ptr style interface for memory management - m_IsOwner(true) + m_IsOwner(true), #endif -m_Pool(a_Pool) + m_Pool(a_Pool) { for (size_t i = 0; i < NumSections; i++) { |