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

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

Location:

code/branches/core7/src/libraries/core/singleton

Files:

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

code/branches/core7/src/libraries/core/singleton/ScopeManager.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    /* static */ ScopeManager& ScopeManager::getInstance()
-    {
-        static ScopeManager instance;
-        return instance;
-    }
+    ScopeManager* ScopeManager::singletonPtr_s = 0;
 
     void ScopeManager::addScope(ScopeID::Value scope)

code/branches/core7/src/libraries/core/singleton/ScopeManager.h

@@ -41 +41 @@
 #include <set>
 
+#include "util/Singleton.h"
+
 namespace orxonox
 {
@@ -52 +54 @@
         @see See @ref Scope "this description" for details about the interrelationship of Scope, ScopeListener, and ScopeManager.
     */
-    class _CoreExport ScopeManager
+    class _CoreExport ScopeManager : public Singleton<ScopeManager>
     {
+        friend class Singleton<ScopeManager>;
+
         public:
-            static ScopeManager& getInstance();
-
             /** Adds a scope and activates all listeners which are registered for this scope */
             void addScope(ScopeID::Value scope);
@@ -78 +80 @@
             std::set<ScopeID::Value> activeScopes_;
             std::map<ScopeID::Value, std::set<ScopeListener*> > listeners_; //!< Stores all listeners for a scope
+
+            static ScopeManager* singletonPtr_s;
     };
 }