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

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.cc (modified) (2 diffs)

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

@@ -33 +33 @@
 namespace orxonox
 {
-    /* static */ StaticInitializationManager& StaticInitializationManager::getInstance()
-    {
-        static StaticInitializationManager instance;
-        return instance;
-    }
+    StaticInitializationManager* StaticInitializationManager::singletonPtr_s = 0;
 
     void StaticInitializationManager::addHandler(StaticInitializationHandler* handler)
     {
+        handler->setupHandler();
         this->handlers_.push_back(handler);
     }
@@ -47 +44 @@
     {
         this->handlers_.remove(handler);
+        handler->shutdownHandler();
     }