diff options
author | Naios <naios-dev@live.de> | 2016-03-11 15:50:17 +0100 |
---|---|---|
committer | Naios <naios-dev@live.de> | 2016-03-11 18:22:39 +0100 |
commit | 5c91586797f199259567629a1d4d3f987c73e53c (patch) | |
tree | 0b6a484caf9dfa75d88d14aeb78e9d82da8c87d0 /src/common/Configuration/Config.cpp | |
parent | f123c396591ffb50fa7e02365235740df618f579 (diff) |
Core/Common: Move singleton instances into compilation units
* Fixes issues when building shared libraries
(prevents gcc and clang from providing several instance)
Diffstat (limited to 'src/common/Configuration/Config.cpp')
-rw-r--r-- | src/common/Configuration/Config.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp index 196c128532e..bc21bb47b48 100644 --- a/src/common/Configuration/Config.cpp +++ b/src/common/Configuration/Config.cpp @@ -57,6 +57,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); |