Core/Common: Move singleton instances into compilation units

* Fixes issues when building shared libraries (prevents gcc and clang from providing several instance) (cherry picked from commit 5c91586)
TrinityCore · Mar 11, 2016 · 998607b · 998607b
1 parent d1efa0b
commit 998607b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h
@@ -84,4 +84,6 @@ class GameObjectModel /*, public Intersectable*/
     std::unique_ptr<GameObjectModelOwnerBase> owner;
 };
 
+void LoadGameObjectModelList(std::string const& dataPath);
+
 #endif // _GAMEOBJECT_MODEL_H
diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp
@@ -56,6 +56,12 @@ bool ConfigMgr::LoadInitial(std::string const& file, std::string& error)
     return true;
 }
 
+ConfigMgr* ConfigMgr::instance()
+{
+    static ConfigMgr instance;
+    return &instance;
+}
+
 bool ConfigMgr::Reload(std::string& error)
 {
     return LoadInitial(_filename, error);

diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h
@@ -33,11 +33,7 @@ class ConfigMgr
     /// Method used only for loading main configuration files (authserver.conf and worldserver.conf)
     bool LoadInitial(std::string const& file, std::string& error);
 
-    static ConfigMgr* instance()
-    {
-        static ConfigMgr instance;
-        return &instance;
-    }
+    static ConfigMgr* instance();
 
     bool Reload(std::string& error);
 

diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp
@@ -320,6 +320,12 @@ void Log::Close()
     appenders.clear();
 }
 
+Log* Log::instance()
+{
+    static Log instance;
+    return &instance;
+}
+
 void Log::Initialize(boost::asio::io_service* ioService)
 {
     if (ioService)

diff --git a/src/common/Logging/Log.h b/src/common/Logging/Log.h
@@ -44,11 +44,7 @@ class Log
 
     public:
 
-        static Log* instance()
-        {
-            static Log instance;
-            return &instance;
-        }
+        static Log* instance();
 
         void Initialize(boost::asio::io_service* ioService);
         void LoadFromConfig();

diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
@@ -38,6 +38,7 @@
 #include "DatabaseEnv.h"
 #include "DisableMgr.h"
 #include "GameEventMgr.h"
+#include "GameObjectModel.h"
 #include "GridNotifiersImpl.h"
 #include "GroupMgr.h"
 #include "GuildMgr.h"
@@ -1305,8 +1306,6 @@ void World::LoadConfigSettings(bool reload)
         sScriptMgr->OnConfigLoad(reload);
 }
 
-extern void LoadGameObjectModelList(std::string const& dataPath);
-
 /// Initialize the World
 void World::SetInitialWorldSettings()
 {