Merge. Revision history for source files should be all back now.

--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h

2 files changed, 4 insertions, 6 deletions

diff --git a/src/server/shared/Debugging/MemoryLeaks.cpp b/src/server/shared/Debugging/MemoryLeaks.cpp
index ef7e36c3b57..c591dabb866 100644
--- a/src/server/shared/Debugging/MemoryLeaks.cpp
+++ b/src/server/shared/Debugging/MemoryLeaks.cpp
@@ -17,9 +17,6 @@
  */
 
 #include "MemoryLeaks.h"
-#include "Policies/SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1( MemoryManager ) ;
 
 MemoryManager::MemoryManager( )
 {
diff --git a/src/server/shared/Debugging/MemoryLeaks.h b/src/server/shared/Debugging/MemoryLeaks.h
index c8b8fb8e1b1..4b13e4d3d90 100644
--- a/src/server/shared/Debugging/MemoryLeaks.h
+++ b/src/server/shared/Debugging/MemoryLeaks.h
@@ -19,7 +19,7 @@
 #ifndef TRINITYSERVER_MEMORY_H
 #define TRINITYSERVER_MEMORY_H
 
-#include "Platform/CompilerDefs.h"
+#include "shared/CompilerDefs.h"
 
 #if COMPILER == COMPILER_MICROSOFT
 
@@ -39,10 +39,11 @@
 #endif
 
 
-#include "Policies/Singleton.h"
+#include "ace/Singleton.h"
 
-struct MemoryManager : public Trinity::Singleton < MemoryManager >
+struct MemoryManager
 {
     MemoryManager();
 };
+#define sMemoryManager ACE_Singleton<MemoryManager, ACE_Null_Mutex>::instance()
 #endif