Core: Converted (hopefully) all remaining singletons to use ACE_Singleton class

--HG--
branch : trunk

2 files changed, 4 insertions, 10 deletions

diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index c5a1e6a35f3..925a0c947a4 100755
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -256,12 +256,6 @@ SpellMgr::~SpellMgr()
 {
 }
 
-SpellMgr& SpellMgr::Instance()
-{
-    static SpellMgr spellMgr;
-    return spellMgr;
-}
-
 bool SpellMgr::IsSrcTargetSpell(SpellEntry const *spellInfo) const
 {
     for (uint8 i = 0; i< MAX_SPELL_EFFECTS; ++i)
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index 7e4d51b5a99..8b5cf987267 100755
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -21,6 +21,7 @@
 
 // For static or at-server-startup loaded spell data
 // For more high level function for sSpellStore data
+#include <ace/Singleton.h>
 
 #include "SharedDefines.h"
 #include "SpellAuraDefines.h"
@@ -914,8 +915,7 @@ inline bool IsProfessionOrRidingSkill(uint32 skill)
 
 class SpellMgr
 {
-    // Constructors
-    public:
+        friend class ACE_Singleton<SpellMgr, ACE_Null_Mutex>;
         SpellMgr();
         ~SpellMgr();
 
@@ -1387,7 +1387,6 @@ class SpellMgr
 
     // Modifiers
     public:
-        static SpellMgr& Instance();
 
         // Loading data at server startup
         void LoadSpellRanks();
@@ -1443,5 +1442,6 @@ class SpellMgr
         SpellDifficultySearcherMap mSpellDifficultySearcherMap;
 };
 
-#define sSpellMgr SpellMgr::Instance()
+#define sSpellMgr (*ACE_Singleton<SpellMgr, ACE_Null_Mutex>::instance())
+
 #endif