Changeset 10412 for code/branches/core7/src/libraries/core/singleton/Scope.cc

Timestamp:

May 2, 2015, 10:41:10 PM (9 years ago)

Author:

landauf

Message:

fixed crash: apparently these static maps get initialized later now that Scope.cc is in core instead of util. using static getters fixed the issue.

File:

• code/branches/core7/src/libraries/core/singleton/Scope.cc (modified) (1 diff)

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

@@ -36 +36 @@
 namespace orxonox
 {
-    std::map<ScopeID::Value, int> ScopeManager::instanceCounts_s;
-    std::map<ScopeID::Value, std::set<ScopeListener*> > ScopeManager::listeners_s;
+    /*static*/ std::map<ScopeID::Value, int>& ScopeManager::getInstanceCounts()
+    {
+        static std::map<ScopeID::Value, int> instanceCounts;
+        return instanceCounts;
+    }
+    /*static*/ std::map<ScopeID::Value, std::set<ScopeListener*> >& ScopeManager::getListeners()
+    {
+        static std::map<ScopeID::Value, std::set<ScopeListener*> > listeners;
+        return listeners;
+    }
 }