From 86104e0bf0b76c06160eb299989262d0e9619c1c Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 27 May 2007 11:40:03 +0000 Subject: Reverted r26922. svn-id: r26967 --- common/config-manager.cpp | 2 ++ common/singleton.h | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'common') diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 41f3c1a7e9..f8426f18d0 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -33,6 +33,8 @@ #include "common/file.h" #include "common/util.h" +DECLARE_SINGLETON(Common::ConfigManager); + #ifdef __PLAYSTATION2__ #include "backends/platform/ps2/systemps2.h" #endif diff --git a/common/singleton.h b/common/singleton.h index f26324999e..5e72e72230 100644 --- a/common/singleton.h +++ b/common/singleton.h @@ -37,6 +37,8 @@ private: Singleton(const Singleton&); Singleton& operator= (const Singleton&); + static T* _singleton; + /** * The default object factory used by the template class Singleton. * By specialising this template function, one can make a singleton use a @@ -56,13 +58,16 @@ public: public: static T& instance() { - // TODO: We aren't thread safe. + // TODO: We aren't thread safe. For now we ignore it since the + // only thing using this singleton template is the config manager, + // and that is first instantiated long before any threads. // TODO: We don't leak, but the destruction order is nevertheless // semi-random. If we use multiple singletons, the destruction // order might become an issue. There are various approaches // to solve that problem, but for now this is sufficient - static T *instance = T::makeInstance(); - return *instance; + if (!_singleton) + _singleton = T::makeInstance(); + return *_singleton; } protected: Singleton() { } @@ -75,6 +80,8 @@ protected: typedef T SingletonBaseType; }; +#define DECLARE_SINGLETON(T) template<> T* Common::Singleton::_singleton=0 + } // End of namespace Common #endif -- cgit v1.2.3