Changeset 3366 for code/branches/resource/src/core/ConfigFileManager.h

Timestamp:

Jul 29, 2009, 10:27:10 PM (16 years ago)

Author:

rgrieder

Message:

Derived all singletons implemented in a usual manner from orxonox::Singleton<T>.
This resolves inconsistencies with the singletonPtr_s variable in case of exceptions (asserts were being triggered then).
And while at it replaced singletonRef_s with singletonPtr_s for it to be less misleading (as fabian has already pointed out).

File:

• code/branches/resource/src/core/ConfigFileManager.h (modified) (4 diffs)

code/branches/resource/src/core/ConfigFileManager.h

@@ -38 +38 @@
 
 #include "util/OrxEnum.h"
+#include "util/Singleton.h"
 
 namespace orxonox
@@ -267 +268 @@
     // ConfigFileManager //
     ///////////////////////
-    class _CoreExport ConfigFileManager
-    {
+    class _CoreExport ConfigFileManager : public Singleton<ConfigFileManager>
+    {
+        friend class Singleton<ConfigFileManager>;
         public:
             ConfigFileManager();
@@ -305 +307 @@
             void updateConfigValues(ConfigFileType type);
 
-            static ConfigFileManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
-
         private:
             ConfigFileManager(const ConfigFileManager&);
@@ -315 +315 @@
             unsigned int mininmalFreeType_;
 
-            static ConfigFileManager* singletonRef_s;
+            static ConfigFileManager* singletonPtr_s;
     };
 }