Changeset 6035 for code/trunk/src/libraries

Timestamp:

Nov 5, 2009, 8:19:55 AM (15 years ago)

Author:

rgrieder

Message:

Fixed program termination segfault in the trunk

Location:

code/trunk/src/libraries/core

Files:

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

code/trunk/src/libraries/core/ScopedSingletonManager.cc

@@ -47 +47 @@
         getManagersByScope().insert(std::make_pair(manager->scope_, manager));
     }
-
-    /*static*/ void ScopedSingletonManager::removeManager(ScopedSingletonManager* manager)
-    {
-        getManagers().erase(getManagers().find(manager->className_));
-        for (ManagerMultiMap::iterator it = getManagersByScope().lower_bound(manager->scope_); it != getManagersByScope().upper_bound(manager->scope_);)
-            if (it->second == manager)
-                getManagersByScope().erase(it++);
-            else
-                ++it;
-    }
 }

code/trunk/src/libraries/core/ScopedSingletonManager.h

@@ -52 +52 @@
             virtual ~ScopedSingletonManager() { }
             static void addManager(ScopedSingletonManager* manager);
-            static void removeManager(ScopedSingletonManager* manager);
 
             template<ScopeID::Value scope>
@@ -86 +85 @@
         ~ClassScopedSingletonManager()
         {
-            //assert(singletonPtr_ == NULL); // Might get triggered in the SignalHandler
-            ScopedSingletonManager::removeManager(this);
         }
 
@@ -140 +137 @@
         ~ClassScopedSingletonManager()
         {
-            assert(singletonPtr_ == NULL);
-            ScopedSingletonManager::removeManager(this);
         }