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/Scripting/ScriptMgr.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/server/game/Scripting/ScriptMgr.h')

diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 8a00305b4da..750298eec86 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -857,11 +857,7 @@ class ScriptMgr
         virtual ~ScriptMgr();
 
     public: /* Initialization */
-        static ScriptMgr* instance()
-        {
-            static ScriptMgr instance;
-            return &instance;
-        }
+        static ScriptMgr* instance();
 
         void Initialize();
         void LoadDatabase();
-- 
cgit v1.2.3