From ede5a5a53b41a52bd5f476506e09c6e0adbe6433 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Mon, 19 Dec 2016 09:25:51 +0100
Subject: [PATCH] Fixed: Servers compilation

--HG--
branch : develop
---
 code/ryzom/server/src/ags_test/move_grid.h            | 4 ++--
 code/ryzom/server/src/entity_view_service/move_grid.h | 4 ++--
 code/ryzom/server/src/gpm_service/cell.h              | 2 +-
 code/ryzom/server/src/gpm_service/move_grid.h         | 6 +++---
 code/ryzom/server/src/gpm_service/world_entity.cpp    | 2 +-
 code/ryzom/server/src/gpm_service/world_entity.h      | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/ryzom/server/src/ags_test/move_grid.h b/code/ryzom/server/src/ags_test/move_grid.h
index ba03c2610..70790e091 100644
--- a/code/ryzom/server/src/ags_test/move_grid.h
+++ b/code/ryzom/server/src/ags_test/move_grid.h
@@ -282,10 +282,10 @@ CMoveGrid<T, CELLS, CSIZE>::~CMoveGrid()
 				while ((node = cellNode->NodeList.getHead()) != NULL)
 				{
 					cellNode->NodeList.remove(node);
-					_NodeAllocator.free(node);
+					_NodeAllocator.freeBlock(node);
 				}
 				list.remove(cellNode);
-				_CellNodeAllocator.free(cellNode);
+				_CellNodeAllocator.freeBlock(cellNode);
 			}
 		}
 	}
diff --git a/code/ryzom/server/src/entity_view_service/move_grid.h b/code/ryzom/server/src/entity_view_service/move_grid.h
index 8d8aae34b..13e6fc3fa 100644
--- a/code/ryzom/server/src/entity_view_service/move_grid.h
+++ b/code/ryzom/server/src/entity_view_service/move_grid.h
@@ -227,7 +227,7 @@ CMoveGrid<T, CELLS, CSIZE>::~CMoveGrid()
 			while ((node = list.getHead()) != NULL)
 			{
 				list.remove(node);
-				_NodeAllocator.free(node);
+				_NodeAllocator.freeBlock(node);
 			}
 		}
 	}
@@ -282,7 +282,7 @@ void	CMoveGrid<T, CELLS, CSIZE>::remove(CIterator &it)
 
 	it._Node = NULL;
 
-	_NodeAllocator.free(node);
+	_NodeAllocator.freeBlock(node);
 }
 
 
diff --git a/code/ryzom/server/src/gpm_service/cell.h b/code/ryzom/server/src/gpm_service/cell.h
index 8cc740a08..382358a93 100644
--- a/code/ryzom/server/src/gpm_service/cell.h
+++ b/code/ryzom/server/src/gpm_service/cell.h
@@ -191,7 +191,7 @@ public:
 	static CCell	*create()				{ return _CellAllocator.allocate(); }
 
 	/// Removes an entity (delete equivalent).
-	static void		remove(CCell *cell)		{ _CellAllocator.free(cell); }
+	static void		remove(CCell *cell)		{ _CellAllocator.freeBlock(cell); }
 
 private:
 
diff --git a/code/ryzom/server/src/gpm_service/move_grid.h b/code/ryzom/server/src/gpm_service/move_grid.h
index 60cb36da9..4e0022e7c 100644
--- a/code/ryzom/server/src/gpm_service/move_grid.h
+++ b/code/ryzom/server/src/gpm_service/move_grid.h
@@ -381,10 +381,10 @@ void	CMoveGrid<T, CELLS, CSIZE>::clear()
 				while ((node = cellNode->NodeList.getHead()) != NULL)
 				{
 					cellNode->NodeList.remove(node);
-					_NodeAllocator.free(node);
+					_NodeAllocator.freeBlock(node);
 				}
 				list.remove(cellNode);
-				_CellNodeAllocator.free(cellNode);
+				_CellNodeAllocator.freeBlock(cellNode);
 			}
 		}
 	}
@@ -482,7 +482,7 @@ void	CMoveGrid<T, CELLS, CSIZE>::remove(CIterator &it)
 	removeNode(it);
 	it._Node = NULL;
 
-	_NodeAllocator.free(node);
+	_NodeAllocator.freeBlock(node);
 }
 
 
diff --git a/code/ryzom/server/src/gpm_service/world_entity.cpp b/code/ryzom/server/src/gpm_service/world_entity.cpp
index 7ebdcbf2a..ce1f5af69 100644
--- a/code/ryzom/server/src/gpm_service/world_entity.cpp
+++ b/code/ryzom/server/src/gpm_service/world_entity.cpp
@@ -67,7 +67,7 @@ void			CWorldEntity::remove(CWorldEntity* entity)
 	{
 		CWorldPositionManager::_PrimitivedList.erase(entity->PrimIterator);
 	}
-	_EntityAllocator.free(entity);
+	_EntityAllocator.freeBlock(entity);
 }
 
 
diff --git a/code/ryzom/server/src/gpm_service/world_entity.h b/code/ryzom/server/src/gpm_service/world_entity.h
index e22e2359c..50f04e2fd 100644
--- a/code/ryzom/server/src/gpm_service/world_entity.h
+++ b/code/ryzom/server/src/gpm_service/world_entity.h
@@ -461,7 +461,7 @@ public:
 	static CPlayerInfos	*create()				{ return _PlayerAllocator.allocate(); }
 
 	/// Removes an entity (delete equivalent).
-	static void remove(CPlayerInfos *player)	{ _PlayerAllocator.free(player); }
+	static void remove(CPlayerInfos *player)	{ _PlayerAllocator.freeBlock(player); }
 
 private: