Changeset 10542 for code/branches/core7/src/libraries/core/command

Timestamp:

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

Author:

landauf

Message:

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

Location:

code/branches/core7/src/libraries/core/command

Files:

• ConsoleCommandManager.cc (modified) (1 diff)
• ConsoleCommandManager.h (modified) (3 diffs)

code/branches/core7/src/libraries/core/command/ConsoleCommandManager.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    /* static */ ConsoleCommandManager& ConsoleCommandManager::getInstance()
-    {
-        static ConsoleCommandManager instance;
-        return instance;
-    }
+    ConsoleCommandManager* ConsoleCommandManager::singletonPtr_s = 0;
 
     /**

code/branches/core7/src/libraries/core/command/ConsoleCommandManager.h

@@ -37 +37 @@
 #include "core/CorePrereqs.h"
 
+#include "util/Singleton.h"
+
 namespace orxonox
 {
@@ -42 +44 @@
      * A singleton that stores all existing ConsoleCommands.
      */
-    class _CoreExport ConsoleCommandManager
+    class _CoreExport ConsoleCommandManager : public Singleton<ConsoleCommandManager>
     {
+        friend class Singleton<ConsoleCommandManager>;
+
         public:
-            static ConsoleCommandManager& getInstance();
-
             void registerCommand(ConsoleCommand* command);
             void registerCommand(const std::string& group, const std::string& name, ConsoleCommand* command);
@@ -71 +73 @@
             std::map<std::string, std::map<std::string, ConsoleCommand*> > commandMap_;
             std::map<std::string, std::map<std::string, ConsoleCommand*> > commandMapLC_;
+
+            static ConsoleCommandManager* singletonPtr_s;
     };
 }