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/Pools | |
| 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/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 006ce9c52f7..3461813f7c4 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 59cbee83094..5491d7d2069 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(); |
