Changeset 10542 for code/branches/core7/src/libraries/core/module/StaticInitializationManager.h

Timestamp:

Jun 7, 2015, 2:16:55 PM (9 years ago)

Author:

landauf

Message:

clean and explicit setup/shutdown of singletons that are used by statically initialized instances

File:

• code/branches/core7/src/libraries/core/module/StaticInitializationManager.h (modified) (2 diffs)

code/branches/core7/src/libraries/core/module/StaticInitializationManager.h

@@ -34 +34 @@
 #include <list>
 
+#include "util/Singleton.h"
+
 namespace orxonox
 {
-    class _CoreExport StaticInitializationManager
+    class _CoreExport StaticInitializationManager : public Singleton<StaticInitializationManager>
     {
+        friend class Singleton<StaticInitializationManager>;
+
         public:
-            static StaticInitializationManager& getInstance();
-
             StaticInitializationManager() {}
             virtual ~StaticInitializationManager() {}
@@ -52 +54 @@
         private:
             std::list<StaticInitializationHandler*> handlers_;
+
+            static StaticInitializationManager* singletonPtr_s;
     };
 }