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/Groups | |
| 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/Groups')
| -rw-r--r-- | src/server/game/Groups/GroupMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Groups/GroupMgr.h | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/server/game/Groups/GroupMgr.cpp b/src/server/game/Groups/GroupMgr.cpp index 24d4983a1e0..c6046c3a9aa 100644 --- a/src/server/game/Groups/GroupMgr.cpp +++ b/src/server/game/Groups/GroupMgr.cpp @@ -92,6 +92,12 @@ ObjectGuid::LowType GroupMgr::GenerateGroupId() return NextGroupId++; } +GroupMgr* GroupMgr::instance() +{ + static GroupMgr instance; + return &instance; +} + Group* GroupMgr::GetGroupByGUID(ObjectGuid const& groupId) const { GroupContainer::const_iterator itr = GroupStore.find(groupId.GetCounter()); diff --git a/src/server/game/Groups/GroupMgr.h b/src/server/game/Groups/GroupMgr.h index 25dd1275908..d9f39c1fbd9 100644 --- a/src/server/game/Groups/GroupMgr.h +++ b/src/server/game/Groups/GroupMgr.h @@ -27,11 +27,7 @@ private: ~GroupMgr(); public: - static GroupMgr* instance() - { - static GroupMgr instance; - return &instance; - } + static GroupMgr* instance(); typedef std::map<ObjectGuid::LowType, Group*> GroupContainer; typedef std::vector<Group*> GroupDbContainer; |
