From 329225b40d110bed634f8cd0a1ab5c6dc7bbbdd1 Mon Sep 17 00:00:00 2001 From: Naios Date: Fri, 11 Mar 2016 17:11:05 +0100 Subject: Core/Game: Move singleton instances into compilation units * Fixes issues when building shared libraries (prevents gcc and clang from providing several instance) --- src/server/game/Conditions/ConditionMgr.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/server/game/Conditions/ConditionMgr.cpp') diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 3dfbb2a12e1..c0c4c7c485c 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -926,6 +926,12 @@ bool ConditionMgr::IsObjectMeetingVendorItemConditions(uint32 creatureId, uint32 return true; } +ConditionMgr* ConditionMgr::instance() +{ + static ConditionMgr instance; + return &instance; +} + void ConditionMgr::LoadConditions(bool isReload) { uint32 oldMSTime = getMSTime(); -- cgit v1.2.3