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/Pools | |
| 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/Pools')
| -rw-r--r-- | src/server/game/Pools/PoolMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Pools/PoolMgr.h | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 12fb8a06b62..81d318fb1d9 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -570,6 +570,12 @@ void PoolMgr::Initialize() mCreatureSearchMap.clear(); } +PoolMgr* PoolMgr::instance() +{ + static PoolMgr instance; + return &instance; +} + void PoolMgr::LoadFromDB() { // Pool templates diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h index 51e0bcb4cac..6c48a011b73 100644 --- a/src/server/game/Pools/PoolMgr.h +++ b/src/server/game/Pools/PoolMgr.h @@ -108,11 +108,7 @@ class PoolMgr ~PoolMgr() { }; public: - static PoolMgr* instance() - { - static PoolMgr instance; - return &instance; - } + static PoolMgr* instance(); void LoadFromDB(); void LoadQuestPools(); |
