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/Conditions/ConditionMgr.cpp | 6 ++++++
 src/server/game/Conditions/ConditionMgr.h   | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

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

diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 6da83aad1a8..50e3e64ea2c 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -928,6 +928,12 @@ bool ConditionMgr::IsObjectMeetingVendorItemConditions(uint32 creatureId, uint32
     return true;
 }
 
+ConditionMgr* ConditionMgr::instance()
+{
+    static ConditionMgr instance;
+    return &instance;
+}
+
 void ConditionMgr::LoadConditions(bool isReload)
 {
     uint32 oldMSTime = getMSTime();
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
index 7dc4592a6a9..0b49552acb4 100644
--- a/src/server/game/Conditions/ConditionMgr.h
+++ b/src/server/game/Conditions/ConditionMgr.h
@@ -231,11 +231,7 @@ class ConditionMgr
         ~ConditionMgr();
 
     public:
-        static ConditionMgr* instance()
-        {
-            static ConditionMgr instance;
-            return &instance;
-        }
+        static ConditionMgr* instance();
 
         void LoadConditions(bool isReload = false);
         bool isConditionTypeValid(Condition* cond) const;
-- 
cgit v1.2.3