diff options
author | Naios <naios-dev@live.de> | 2016-03-11 18:55:33 +0100 |
---|---|---|
committer | Naios <naios-dev@live.de> | 2016-03-11 18:55:33 +0100 |
commit | 998607b1067c453df0d1ad1a450d72faab5fd922 (patch) | |
tree | 2cbc52651395c451056605d4781d7e60e693512f /src/common/Configuration/Config.h | |
parent | d1efa0b8b1a553b184f884ad757bcebc913f117b (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.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 ada910d8fcc..6882517b509 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 (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); |