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.h | |
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.h')
-rw-r--r-- | src/common/Configuration/Config.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h index 77150e9b436..c1c50e8f1e8 100644 --- a/src/common/Configuration/Config.h +++ b/src/common/Configuration/Config.h @@ -33,11 +33,7 @@ public: /// Method used only for loading main configuration files 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); |