diff options
author | Naios <naios-dev@live.de> | 2016-03-11 19:41:10 +0100 |
---|---|---|
committer | Naios <naios-dev@live.de> | 2016-03-11 20:03:12 +0100 |
commit | b7f936891aeb86eeb4eb67caa78e672858aa1e20 (patch) | |
tree | 9a436108fc01da66aaa90ae062bd3d56fc0c37d0 /src/server/game/Scripting/ScriptSystem.h | |
parent | 3a4ec8bcbee91e2ad03d4f9e421f45df14b1acac (diff) |
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)
Diffstat (limited to 'src/server/game/Scripting/ScriptSystem.h')
-rw-r--r-- | src/server/game/Scripting/ScriptSystem.h | 6 |
1 files changed, 1 insertions, 5 deletions
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<uint32, ScriptPointVector> PointMoveMap; |