Bug 536158 – also bump GHashTable version when a node is removed via

        g_hash_table_iter_remove()/g_hash_table_iter_steal()

        * glib/ghash.c (iter_remove_or_steal): Bump the hash table
        version. Patch by Jean-Yves Lefort

svn path=/trunk/; revision=6993

diff --git a/ChangeLog b/ChangeLog
index 5c73df3..eb50688 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 536158 – also bump GHashTable version when a node is removed via
+       g_hash_table_iter_remove()/g_hash_table_iter_steal()
+
+       * glib/ghash.c (iter_remove_or_steal): Bump the hash table 
+       version. Patch by Jean-Yves Lefort
+
 2008-06-07  Tor Lillqvist  <tml@novell.com>
 
        * glib/gstdio.c (g_access): Define X_OK if necessary (MSVC).

diff --git a/glib/ghash.c b/glib/ghash.c
index af81f5a..e00b4c4 100644 (file)
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -530,6 +530,11 @@ iter_remove_or_steal (RealIter *ri, gboolean notify)
   g_slice_free (GHashNode, node);
 
   ri->hash_table->nnodes--;
+
+#ifndef G_DISABLE_ASSERT
+  ri->version++;
+  ri->hash_table->version++;
+#endif
 }
 
 /**