From b7f936891aeb86eeb4eb67caa78e672858aa1e20 Mon Sep 17 00:00:00 2001 From: Naios Date: Fri, 11 Mar 2016 19:41:10 +0100 Subject: 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) --- src/server/game/Guilds/GuildMgr.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/server/game/Guilds/GuildMgr.cpp') diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp index 2d4fb849fb5..a4d245cbc9b 100644 --- a/src/server/game/Guilds/GuildMgr.cpp +++ b/src/server/game/Guilds/GuildMgr.cpp @@ -79,6 +79,12 @@ std::string GuildMgr::GetGuildNameById(ObjectGuid::LowType guildId) const return ""; } +GuildMgr* GuildMgr::instance() +{ + static GuildMgr instance; + return &instance; +} + Guild* GuildMgr::GetGuildByLeader(ObjectGuid guid) const { for (GuildContainer::const_iterator itr = GuildStore.begin(); itr != GuildStore.end(); ++itr) -- cgit v1.2.3