Changeset 296839 for src/Patterns

Timestamp:

Apr 2, 2011, 12:21:41 AM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

1b1ba8

Parents:

bbd746

git-author:

Frederik Heber <heber@…> (04/01/11 12:34:08)

git-committer:

Frederik Heber <heber@…> (04/02/11 00:21:41)

Message:

BUGFIX: Registry<T>::cleanup() - first erase from list, then delete instance.

• if we just delete all instances, then free the list. We ran into problems when instances had an unregisterInstance() call in their destructor for this effectively invalidated the current iterator.
• Library version is now 7:2:0, API version is 1.1.2.

File:

• src/Patterns/Registry_impl.hpp (modified) (1 diff)

src/Patterns/Registry_impl.hpp

@@ -78 +78 @@
 template <class T>void Registry<T>::cleanup()
 {
-  typename std::map<const std::string,T*>::iterator iter;
-  for(iter=InstanceMap.begin();iter!=InstanceMap.end();++iter) {
+  typename std::map<const std::string,T*>::iterator iter = InstanceMap.begin();
+  for(;!InstanceMap.empty();iter=InstanceMap.begin()) {
     //std::cerr << "Removing instance "+iter->first+" from registry" << std::endl;
-    delete iter->second;
+    T* instance = iter->second;
+    InstanceMap.erase(iter);
+    delete instance;
   }
   InstanceMap.clear();