Changeset 10412 for code/branches/core7/src/libraries/core

Timestamp:

May 2, 2015, 10:41:10 PM (10 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.

Location:

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

Files:

• Scope.cc (modified) (1 diff)
• Scope.h (modified) (7 diffs)

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;
+    }
 }

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

@@ -80 +80 @@
 
         private:
-            static std::map<ScopeID::Value, int> instanceCounts_s;                  //!< Counts the number of active instances (>0 means active) for a scope
-            static std::map<ScopeID::Value, std::set<ScopeListener*> > listeners_s; //!< Stores all listeners for a scope
+            static std::map<ScopeID::Value, int>& getInstanceCounts();                  //!< Counts the number of active instances (>0 means active) for a scope
+            static std::map<ScopeID::Value, std::set<ScopeListener*> >& getListeners(); //!< Stores all listeners for a scope
     };
 
@@ -98 +98 @@
             //! Constructor: Registers the instance.
             ScopeListener(ScopeID::Value scope) : scope_(scope), bActivated_(false)
-                { ScopeManager::listeners_s[this->scope_].insert(this); }
+                { ScopeManager::getListeners()[this->scope_].insert(this); }
             //! Destructor: Unregisters the instance.
             virtual ~ScopeListener()
-                { ScopeManager::listeners_s[this->scope_].erase(this); }
+                { ScopeManager::getListeners()[this->scope_].erase(this); }
 
             //! Gets called if the scope is activated
@@ -132 +132 @@
                 try
                 {
-                    ScopeManager::instanceCounts_s[scope]++;
-                    assert(ScopeManager::instanceCounts_s[scope] > 0);
-                    if (ScopeManager::instanceCounts_s[scope] == 1)
+                    ScopeManager::getInstanceCounts()[scope]++;
+                    assert(ScopeManager::getInstanceCounts()[scope] > 0);
+                    if (ScopeManager::getInstanceCounts()[scope] == 1)
                     {
                         Loki::ScopeGuard deactivator = Loki::MakeObjGuard(*this, &Scope::deactivateListeners);
-                        for (typename std::set<ScopeListener*>::iterator it = ScopeManager::listeners_s[scope].begin(); it != ScopeManager::listeners_s[scope].end(); )
+                        for (typename std::set<ScopeListener*>::iterator it = ScopeManager::getListeners()[scope].begin(); it != ScopeManager::getListeners()[scope].end(); )
                         {
                             (*it)->activated();
@@ -147 +147 @@
                 catch (...)
                 {
-                    ScopeManager::instanceCounts_s[scope]--;
+                    ScopeManager::getInstanceCounts()[scope]--;
                     throw;
                 }
@@ -159 +159 @@
                 orxout(internal_status) << "destroying scope... (" << scope << ")" << endl;
 
-                ScopeManager::instanceCounts_s[scope]--;
+                ScopeManager::getInstanceCounts()[scope]--;
 
                 // This shouldn't happen but just to be sure: check if the count is positive
-                assert(ScopeManager::instanceCounts_s[scope] >= 0);
-                if (ScopeManager::instanceCounts_s[scope] < 0)
-                    ScopeManager::instanceCounts_s[scope] = 0;
-
-                if (ScopeManager::instanceCounts_s[scope] == 0)
+                assert(ScopeManager::getInstanceCounts()[scope] >= 0);
+                if (ScopeManager::getInstanceCounts()[scope] < 0)
+                    ScopeManager::getInstanceCounts()[scope] = 0;
+
+                if (ScopeManager::getInstanceCounts()[scope] == 0)
                     this->deactivateListeners();
 
@@ -175 +175 @@
             void deactivateListeners()
             {
-                for (typename std::set<ScopeListener*>::iterator it = ScopeManager::listeners_s[scope].begin(); it != ScopeManager::listeners_s[scope].end(); )
+                for (typename std::set<ScopeListener*>::iterator it = ScopeManager::getListeners()[scope].begin(); it != ScopeManager::getListeners()[scope].end(); )
                 {
                     if ((*it)->bActivated_)
@@ -193 +193 @@
             static bool isActive()
             {
-                return (ScopeManager::instanceCounts_s[scope] > 0);
+                return (ScopeManager::getInstanceCounts()[scope] > 0);
             }
     };