From b7f936891aeb86eeb4eb67caa78e672858aa1e20 Mon Sep 17 00:00:00 2001
From: Naios <naios-dev@live.de>
Date: Fri, 11 Mar 2016 19:41:10 +0100
Subject: Core/Game: Move singleton instances into compilation units * Fixes
 issues when building shared libraries   (prevents gcc and clang from
 providing several instance)

(cherry picked from commit 329225b40d110bed634f8cd0a1ab5c6dc7bbbdd1)
---
 src/server/game/Pools/PoolMgr.cpp | 6 ++++++
 src/server/game/Pools/PoolMgr.h   | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/server/game/Pools')

diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp
index 12fb8a06b62..81d318fb1d9 100644
--- a/src/server/game/Pools/PoolMgr.cpp
+++ b/src/server/game/Pools/PoolMgr.cpp
@@ -570,6 +570,12 @@ void PoolMgr::Initialize()
     mCreatureSearchMap.clear();
 }
 
+PoolMgr* PoolMgr::instance()
+{
+    static PoolMgr instance;
+    return &instance;
+}
+
 void PoolMgr::LoadFromDB()
 {
     // Pool templates
diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h
index 51e0bcb4cac..6c48a011b73 100644
--- a/src/server/game/Pools/PoolMgr.h
+++ b/src/server/game/Pools/PoolMgr.h
@@ -108,11 +108,7 @@ class PoolMgr
         ~PoolMgr() { };
 
     public:
-        static PoolMgr* instance()
-        {
-            static PoolMgr instance;
-            return &instance;
-        }
+        static PoolMgr* instance();
 
         void LoadFromDB();
         void LoadQuestPools();
-- 
cgit v1.2.3