Core/Game: Move singleton instances into compilation units

* Fixes issues when building shared libraries
  (prevents gcc and clang from providing several instance)

4 files changed, 14 insertions, 10 deletions

diff --git a/src/server/game/Guilds/GuildFinderMgr.cpp b/src/server/game/Guilds/GuildFinderMgr.cpp
index de355712be4..961827c9d3b 100644
--- a/src/server/game/Guilds/GuildFinderMgr.cpp
+++ b/src/server/game/Guilds/GuildFinderMgr.cpp
@@ -339,3 +339,9 @@ void GuildFinderMgr::SendMembershipRequestListUpdate(Player* player)
 {
     player->SendDirectMessage(WorldPackets::GuildFinder::LFGuildApplicationsListChanged().Write());
 }
+
+GuildFinderMgr* GuildFinderMgr::instance()
+{
+    static GuildFinderMgr instance;
+    return &instance;
+}
diff --git a/src/server/game/Guilds/GuildFinderMgr.h b/src/server/game/Guilds/GuildFinderMgr.h
index 6a705a5b4ef..d0cd29b0bee 100644
--- a/src/server/game/Guilds/GuildFinderMgr.h
+++ b/src/server/game/Guilds/GuildFinderMgr.h
@@ -265,11 +265,7 @@ class GuildFinderMgr
         static void SendApplicantListUpdate(Guild* guild);
         static void SendMembershipRequestListUpdate(Player* player);
 
-        static GuildFinderMgr* instance()
-        {
-            static GuildFinderMgr instance;
-            return &instance;
-        }
+        static GuildFinderMgr* instance();
 };
 
 #define sGuildFinderMgr GuildFinderMgr::instance()
diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp
index d8969d73e72..8cafc8cdd2f 100644
--- a/src/server/game/Guilds/GuildMgr.cpp
+++ b/src/server/game/Guilds/GuildMgr.cpp
@@ -96,6 +96,12 @@ std::string GuildMgr::GetGuildNameById(ObjectGuid::LowType guildId) const
     return "";
 }
 
+GuildMgr* GuildMgr::instance()
+{
+    static GuildMgr instance;
+    return &instance;
+}
+
 Guild* GuildMgr::GetGuildByLeader(ObjectGuid guid) const
 {
     for (GuildContainer::const_iterator itr = GuildStore.begin(); itr != GuildStore.end(); ++itr)
diff --git a/src/server/game/Guilds/GuildMgr.h b/src/server/game/Guilds/GuildMgr.h
index 069f4e165eb..16786757a6d 100644
--- a/src/server/game/Guilds/GuildMgr.h
+++ b/src/server/game/Guilds/GuildMgr.h
@@ -27,11 +27,7 @@ private:
     ~GuildMgr();
 
 public:
-    static GuildMgr* instance()
-    {
-        static GuildMgr instance;
-        return &instance;
-    }
+    static GuildMgr* instance();
 
     Guild* GetGuildByLeader(ObjectGuid guid) const;
     Guild* GetGuildById(ObjectGuid::LowType guildId) const;