diff options
author | Henri Herscher <henri@oreka.org> | 2007-09-12 19:31:31 +0000 |
---|---|---|
committer | Henri Herscher <henri@oreka.org> | 2007-09-12 19:31:31 +0000 |
commit | 2ed32e3e08899067f1c339bfc8076c79a6806131 (patch) | |
tree | a5a8f45d1ffca1038eb3de3cf73e46355cbb31ac /orkbasecxx | |
parent | 9a9d5268c35a25a6c574db889fbe7300a650d900 (diff) |
ConfigManager singleton now stored as a pointer.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@488 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkbasecxx')
-rw-r--r-- | orkbasecxx/ConfigManager.cpp | 8 | ||||
-rw-r--r-- | orkbasecxx/ConfigManager.h | 2 |
2 files changed, 7 insertions, 3 deletions
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<ConfigureFunction> m_configureFunctions; DOMNode* m_configTopNode; XercesDOMParser *m_parser; |