Changeset 10462 for code/branches/core7/src/libraries/core/singleton/Scope.h

Timestamp:

May 24, 2015, 11:42:16 PM (9 years ago)

Author:

landauf

Message:

some refactoring in ScopeManager. made it a singleton and added functions.

File:

• code/branches/core7/src/libraries/core/singleton/Scope.h (modified) (5 diffs)

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

@@ -111 +111 @@
                 try
                 {
-                    ScopeManager::getInstanceCounts()[scope]++;
-                    assert(ScopeManager::getInstanceCounts()[scope] > 0);
-                    if (ScopeManager::getInstanceCounts()[scope] == 1)
+                    ScopeManager::getInstance().getInstanceCount(scope)++;
+                    assert(ScopeManager::getInstance().getInstanceCount(scope) > 0);
+                    if (ScopeManager::getInstance().getInstanceCount(scope) == 1)
                     {
                         Loki::ScopeGuard deactivator = Loki::MakeObjGuard(*this, &Scope::deactivateListeners);
-                        for (typename std::set<ScopeListener*>::iterator it = ScopeManager::getListeners()[scope].begin(); it != ScopeManager::getListeners()[scope].end(); )
+                        for (typename std::set<ScopeListener*>::iterator it = ScopeManager::getInstance().getListeners(scope).begin(); it != ScopeManager::getInstance().getListeners(scope).end(); )
                         {
                             (*it)->activated();
@@ -126 +126 @@
                 catch (...)
                 {
-                    ScopeManager::getInstanceCounts()[scope]--;
+                    ScopeManager::getInstance().getInstanceCount(scope)--;
                     throw;
                 }
@@ -138 +138 @@
                 orxout(internal_status) << "destroying scope... (" << scope << ")" << endl;
 
-                ScopeManager::getInstanceCounts()[scope]--;
+                ScopeManager::getInstance().getInstanceCount(scope)--;
 
                 // This shouldn't happen but just to be sure: check if the count is positive
-                assert(ScopeManager::getInstanceCounts()[scope] >= 0);
-                if (ScopeManager::getInstanceCounts()[scope] < 0)
-                    ScopeManager::getInstanceCounts()[scope] = 0;
+                assert(ScopeManager::getInstance().getInstanceCount(scope) >= 0);
+                if (ScopeManager::getInstance().getInstanceCount(scope) < 0)
+                    ScopeManager::getInstance().getInstanceCount(scope) = 0;
 
-                if (ScopeManager::getInstanceCounts()[scope] == 0)
+                if (ScopeManager::getInstance().getInstanceCount(scope) == 0)
                     this->deactivateListeners();
 
@@ -154 +154 @@
             void deactivateListeners()
             {
-                for (typename std::set<ScopeListener*>::iterator it = ScopeManager::getListeners()[scope].begin(); it != ScopeManager::getListeners()[scope].end(); )
+                for (typename std::set<ScopeListener*>::iterator it = ScopeManager::getInstance().getListeners(scope).begin(); it != ScopeManager::getInstance().getListeners(scope).end(); )
                 {
                     if ((*it)->bActivated_)
@@ -172 +172 @@
             static bool isActive()
             {
-                return (ScopeManager::getInstanceCounts()[scope] > 0);
+                return (ScopeManager::getInstance().getInstanceCount(scope) > 0);
             }
     };