aboutsummaryrefslogtreecommitdiff
path: root/src/common/Configuration/Config.cpp
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2016-03-11 18:55:33 +0100
committerNaios <naios-dev@live.de>2016-03-11 18:55:33 +0100
commit998607b1067c453df0d1ad1a450d72faab5fd922 (patch)
tree2cbc52651395c451056605d4781d7e60e693512f /src/common/Configuration/Config.cpp
parentd1efa0b8b1a553b184f884ad757bcebc913f117b (diff)
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 5c91586797f199259567629a1d4d3f987c73e53c)
Diffstat (limited to 'src/common/Configuration/Config.cpp')
-rw-r--r--src/common/Configuration/Config.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp
index 5db333c8aff..fba438dbd33 100644
--- 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);