[12365] fix Singleton compile error on clang

some members of Singleton were implicitly specialized in the static function definitions, which conflicted with the initialization of said members (clang saw it as a redefinition of the specialization) Signed-off-by: DasBlub <DasBlub@gmail.com>
cmangos · Feb 21, 2013 · 772a5bb · 772a5bb
1 parent 0055d05
commit 772a5bb
Show file tree

Hide file tree

Showing 39 changed files with 87 additions and 128 deletions.
diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h
@@ -22,7 +22,7 @@
 #include "Platform/Define.h"
 #include "Utilities/TypeList.h"
 #include "ObjectRegistry.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 /** FactoryHolder holds a factory object of a specific type
  */

diff --git a/src/framework/Policies/Singleton.h b/src/framework/Policies/Singleton.h
@@ -62,6 +62,56 @@ namespace MaNGOS
             static T* si_instance;
             static bool si_destroyed;
     };
+
+    template<typename T, class ThreadingModel, class CreatePolicy, class LifeTimePolicy>
+    T* Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::si_instance = NULL;
+
+    template<typename T, class ThreadingModel, class CreatePolicy, class LifeTimePolicy>
+    bool Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::si_destroyed = false;
+
+    template<typename T, class ThreadingModel, class CreatePolicy, class LifeTimePolicy>
+    T& MaNGOS::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::Instance()
+    {
+        if (!si_instance)
+        {
+            // double-checked Locking pattern
+            Guard();
+
+            if (!si_instance)
+            {
+                if (si_destroyed)
+                {
+                    si_destroyed = false;
+                    LifeTimePolicy::OnDeadReference();
+                }
+
+                si_instance = CreatePolicy::Create();
+                LifeTimePolicy::ScheduleCall(&DestroySingleton);
+            }
+        }
+
+        return *si_instance;
+    }
+
+    template<typename T, class ThreadingModel, class CreatePolicy, class LifeTimePolicy>
+    void MaNGOS::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::DestroySingleton()
+    {
+        CreatePolicy::Destroy(si_instance);
+        si_instance = NULL;
+        si_destroyed = true;
+    }
 }
 
+#define INSTANTIATE_SINGLETON_1(TYPE) \
+    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
+
+#define INSTANTIATE_SINGLETON_2(TYPE, THREADINGMODEL) \
+    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
+
+#define INSTANTIATE_SINGLETON_3(TYPE, THREADINGMODEL, CREATIONPOLICY ) \
+    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeTime<TYPE> >;
+
+#define INSTANTIATE_SINGLETON_4(TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME) \
+    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >;
+
 #endif
diff --git a/src/framework/Policies/SingletonImp.h b/src/framework/Policies/SingletonImp.h
diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp
@@ -21,7 +21,7 @@
 #include "ObjectAccessor.h"
 #include "ObjectGuid.h"
 #include "Player.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Util.h"
 #include "Auth/Sha1.h"
 

diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
@@ -42,7 +42,7 @@
 #include "InstanceData.h"
 #include "DBCStructure.h"
 
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 INSTANTIATE_SINGLETON_1(AchievementGlobalMgr);
 

diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
@@ -10,7 +10,7 @@
 // for that day.
 #define AUCTIONHOUSEBOT_CONF_VERSION    2010102201
 
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 struct BuyerAuctionEval
 {

diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp
@@ -34,7 +34,7 @@
 #include "WorldSession.h"
 #include "Mail.h"
 
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 INSTANTIATE_SINGLETON_1(AuctionHouseMgr);
 

diff --git a/src/game/BattleGround/BattleGroundMgr.cpp b/src/game/BattleGround/BattleGroundMgr.cpp
@@ -43,7 +43,7 @@
 #include "WorldPacket.h"
 #include "GameEventMgr.h"
 
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 INSTANTIATE_SINGLETON_1(BattleGroundMgr);
 

diff --git a/src/game/Calendar.h b/src/game/Calendar.h
@@ -19,7 +19,7 @@
 #ifndef MANGOS_CALENDAR_H
 #define MANGOS_CALENDAR_H
 
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Common.h"
 #include "ObjectGuid.h"
 #include "SharedDefines.h"

diff --git a/src/game/ChannelMgr.cpp b/src/game/ChannelMgr.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ChannelMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "World.h"
 
 INSTANTIATE_SINGLETON_1(AllianceChannelMgr);

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
@@ -51,7 +51,7 @@
 #include "CreatureLinkingMgr.h"
 
 // apply implementation of the singletons
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 ObjectGuid CreatureData::GetObjectGuid(uint32 lowguid) const
 {

diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp
@@ -20,7 +20,7 @@
 #include "Creature.h"
 #include "CreatureAIImpl.h"
 #include "NullCreatureAI.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "MovementGenerator.h"
 #include "ScriptMgr.h"
 #include "Pet.h"

diff --git a/src/game/CreatureEventAIMgr.cpp b/src/game/CreatureEventAIMgr.cpp
@@ -23,7 +23,7 @@
 #include "CreatureEventAIMgr.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "ObjectGuid.h"
 #include "GridDefines.h"
 #include "SpellMgr.h"

diff --git a/src/game/CreatureLinkingMgr.cpp b/src/game/CreatureLinkingMgr.cpp
@@ -33,7 +33,7 @@
  */
 
 #include "CreatureLinkingMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "ProgressBar.h"
 #include "Database/DatabaseEnv.h"
 #include "ObjectMgr.h"

diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "DBCStores.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Log.h"
 #include "ProgressBar.h"
 #include "SharedDefines.h"

diff --git a/src/game/GMTicketMgr.cpp b/src/game/GMTicketMgr.cpp
@@ -23,7 +23,7 @@
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
 #include "ProgressBar.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Player.h"
 
 INSTANTIATE_SINGLETON_1(GMTicketMgr);

diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp
@@ -28,7 +28,7 @@
 #include "BattleGround/BattleGroundMgr.h"
 #include "MassMailMgr.h"
 #include "SpellMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 INSTANTIATE_SINGLETON_1(GameEventMgr);
 

diff --git a/src/game/GridMap.cpp b/src/game/GridMap.cpp
@@ -27,7 +27,7 @@
 #include "VMapFactory.h"
 #include "MoveMap.h"
 #include "World.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Util.h"
 
 char const* MAP_MAGIC         = "MAPS";

diff --git a/src/game/GuildMgr.cpp b/src/game/GuildMgr.cpp
@@ -21,7 +21,7 @@
 #include "Log.h"
 #include "ObjectGuid.h"
 #include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "ProgressBar.h"
 #include "World.h"
 

diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp
@@ -18,7 +18,7 @@
 
 #include "MapManager.h"
 #include "MapPersistentStateMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
 #include "Transports.h"

diff --git a/src/game/MassMailMgr.cpp b/src/game/MassMailMgr.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "MassMailMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 #include "Database/DatabaseImpl.h"
 #include "SharedDefines.h"

diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp
@@ -18,7 +18,7 @@
 
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Player.h"
 #include "WorldPacket.h"
 #include "Item.h"

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
@@ -18,7 +18,7 @@
 
 #include "ObjectMgr.h"
 #include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 #include "SQLStorages.h"
 #include "Log.h"

diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/game/OutdoorPvP/OutdoorPvPMgr.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "OutdoorPvPMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "OutdoorPvP.h"
 #include "World.h"
 #include "Log.h"

diff --git a/src/game/PoolManager.cpp b/src/game/PoolManager.cpp
@@ -24,7 +24,7 @@
 #include "MapPersistentStateMgr.h"
 #include "MapManager.h"
 #include "World.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 INSTANTIATE_SINGLETON_1(PoolManager);
 

diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ScriptMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Log.h"
 #include "ProgressBar.h"
 #include "ObjectMgr.h"

diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp
@@ -19,7 +19,7 @@
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
 #include "ProgressBar.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "World.h"
 #include "Util.h"
 #include "SkillDiscovery.h"

diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "SocialMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
@@ -37,7 +37,7 @@
 #include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "CellImpl.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "SharedDefines.h"
 #include "LootMgr.h"
 #include "VMapFactory.h"