From 94c48febd2f596648fc2616a8a577316a219b581 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Sat, 14 Jun 2014 19:46:34 +0100
Subject: Added generic Allocation Pool Interface

---
 src/ChunkMap.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/ChunkMap.cpp')

diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 704c4f823..3b946f9ec 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -35,8 +35,14 @@
 
 cChunkMap::cChunkMap(cWorld * a_World )
 	: m_World( a_World ),
-	m_Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks>(new cStarvationCallbacks()))
+	m_Pool(
+		new cListAllocationPool<cChunkData::sChunkSection, 1600>(
+			std::auto_ptr<cAllocationPool<cChunkData::sChunkSection>::cStarvationCallbacks>(
+				new cStarvationCallbacks())
+			)
+		)
 {
+
 }
 
 
@@ -79,7 +85,7 @@ cChunkMap::cChunkLayer * cChunkMap::GetLayer(int a_LayerX, int a_LayerZ)
 	}
 	
 	// Not found, create new:
-	cChunkLayer * Layer = new cChunkLayer(a_LayerX, a_LayerZ, this, m_Pool);
+	cChunkLayer * Layer = new cChunkLayer(a_LayerX, a_LayerZ, this, *m_Pool);
 	if (Layer == NULL)
 	{
 		LOGERROR("cChunkMap: Cannot create new layer, server out of memory?");
@@ -2672,7 +2678,7 @@ void cChunkMap::QueueTickBlock(int a_BlockX, int a_BlockY, int a_BlockZ)
 // cChunkMap::cChunkLayer:
 
 cChunkMap::cChunkLayer::cChunkLayer(int a_LayerX, int a_LayerZ, cChunkMap * a_Parent,
-		                            cAllocationPool<cChunkData::sChunkSection, 1600> & a_Pool)
+		                            cAllocationPool<cChunkData::sChunkSection> & a_Pool)
 	: m_LayerX( a_LayerX )
 	, m_LayerZ( a_LayerZ )
 	, m_Parent( a_Parent )
-- 
cgit v1.2.3