Changeset 10542 for code/branches/core7/src/libraries/core/CoreStaticInitializationHandler.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/CoreStaticInitializationHandler.cc (modified) (2 diffs)

code/branches/core7/src/libraries/core/CoreStaticInitializationHandler.cc

@@ -31 +31 @@
 #include "CoreIncludes.h"
 #include "module/ModuleInstance.h"
+#include "object/Iterator.h"
 #include "class/IdentifierManager.h"
-#include "object/Iterator.h"
+#include "singleton/ScopeManager.h"
+#include "command/ConsoleCommandManager.h"
+#include "commandline/CommandLineParser.h"
 
 namespace orxonox
@@ -38 +41 @@
     void CoreStaticInitializationHandler::setupHandler()
     {
-        // TODO
+        // initialize singletons
+        new IdentifierManager();
+        new ScopeManager();
+        new CommandLineParser();
+        new ConsoleCommandManager();
     }
 
     void CoreStaticInitializationHandler::shutdownHandler()
     {
-        // TODO
+        delete &ConsoleCommandManager::getInstance();
+        delete &CommandLineParser::getInstance();
+        delete &ScopeManager::getInstance();
+        delete &IdentifierManager::getInstance();
     }