From 2ed32e3e08899067f1c339bfc8076c79a6806131 Mon Sep 17 00:00:00 2001 From: Henri Herscher Date: Wed, 12 Sep 2007 19:31:31 +0000 Subject: ConfigManager singleton now stored as a pointer. git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@488 09dcff7a-b715-0410-9601-b79a96267cd0 --- orkbasecxx/ConfigManager.cpp | 8 ++++++-- orkbasecxx/ConfigManager.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'orkbasecxx') diff --git a/orkbasecxx/ConfigManager.cpp b/orkbasecxx/ConfigManager.cpp index adba47d..85ad41e 100644 --- a/orkbasecxx/ConfigManager.cpp +++ b/orkbasecxx/ConfigManager.cpp @@ -30,11 +30,15 @@ # define snprintf _snprintf #endif -ConfigManager ConfigManager::m_singleton; +ConfigManager* ConfigManager::m_singleton = NULL; ConfigManager* ConfigManager::Instance() { - return &m_singleton; + if(m_singleton == NULL) + { + m_singleton = new ConfigManager(); + } + return m_singleton; } void ConfigManager::Initialize() diff --git a/orkbasecxx/ConfigManager.h b/orkbasecxx/ConfigManager.h index a899b05..8d478f7 100644 --- a/orkbasecxx/ConfigManager.h +++ b/orkbasecxx/ConfigManager.h @@ -31,7 +31,7 @@ public: Config m_config; private: - static ConfigManager m_singleton; + static ConfigManager* m_singleton; std::list m_configureFunctions; DOMNode* m_configTopNode; XercesDOMParser *m_parser; -- cgit v1.2.3