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/Globals/ObjectMgr.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/server/game/Globals/ObjectMgr.cpp') diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index f45634e9684..cbb1e03d77c 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -235,6 +235,12 @@ ObjectMgr::ObjectMgr(): } } +ObjectMgr* ObjectMgr::instance() +{ + static ObjectMgr instance; + return &instance; +} + ObjectMgr::~ObjectMgr() { for (QuestMap::iterator i = _questTemplates.begin(); i != _questTemplates.end(); ++i) -- cgit v1.2.3