diff options
author | Naios <naios-dev@live.de> | 2016-03-11 17:11:05 +0100 |
---|---|---|
committer | Naios <naios-dev@live.de> | 2016-03-11 18:35:49 +0100 |
commit | 329225b40d110bed634f8cd0a1ab5c6dc7bbbdd1 (patch) | |
tree | 5cf3f149429e6821660cdc9c04ef3210ac374e4b /src/server/game/Scripting/ScriptMgr.h | |
parent | a8fe7f6eb7195368bbb4d0256927405f5e5c6f87 (diff) |
Core/Game: Move singleton instances into compilation units
* Fixes issues when building shared libraries
(prevents gcc and clang from providing several instance)
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.h')
-rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index aac2cdeabfa..ffc50a51e06 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -856,11 +856,7 @@ class ScriptMgr virtual ~ScriptMgr(); public: /* Initialization */ - static ScriptMgr* instance() - { - static ScriptMgr instance; - return &instance; - } + static ScriptMgr* instance(); void Initialize(); void LoadDatabase(); |