From 998607b1067c453df0d1ad1a450d72faab5fd922 Mon Sep 17 00:00:00 2001 From: Naios Date: Fri, 11 Mar 2016 18:55:33 +0100 Subject: 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) --- src/common/Configuration/Config.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/common/Configuration/Config.cpp') 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); -- cgit v1.2.3