From b7f936891aeb86eeb4eb67caa78e672858aa1e20 Mon Sep 17 00:00:00 2001 From: Naios 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/ScriptSystem.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/server/game/Scripting/ScriptSystem.h') diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h index 74c51e5b136..9e6a0d2a5a7 100644 --- a/src/server/game/Scripting/ScriptSystem.h +++ b/src/server/game/Scripting/ScriptSystem.h @@ -52,11 +52,7 @@ class SystemMgr ~SystemMgr() { } public: - static SystemMgr* instance() - { - static SystemMgr instance; - return &instance; - } + static SystemMgr* instance(); typedef std::unordered_map PointMoveMap; -- cgit v1.2.3