Changeset 296839

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.

Files:

• configure.ac (modified) (2 diffs)
• src/Patterns/Registry_impl.hpp (modified) (1 diff)

configure.ac

@@ -3 +3 @@
 
 AC_PREREQ([2.65])
-AC_INIT([CodePatterns], [1.1.1], [heber@ins.uni-bonn.de], [codepatterns], [http://trac.ins.uni-bonn.de/projects/CodePatterns/])
+AC_INIT([CodePatterns], [1.1.2], [heber@ins.uni-bonn.de], [codepatterns], [http://trac.ins.uni-bonn.de/projects/CodePatterns/])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR([src/Patterns/Singleton_impl.hpp])
@@ -25 +25 @@
 # refer to the libtool manual, section "Updating library version information":
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([CODEPATTERNS_SO_VERSION], [7:1:0])
-AC_SUBST([CODEPATTERNS_API_VERSION], [1.1.1])
+AC_SUBST([CODEPATTERNS_SO_VERSION], [7:2:0])
+AC_SUBST([CODEPATTERNS_API_VERSION], [1.1.2])
 
 # Checks for libraries.

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();