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=/branches/glib-2-16/; revision=7112
This commit is contained in:
Matthias Clasen
2008-06-30 22:19:07 +00:00
parent 1f2eb23cea
commit ed3b351c49
2 changed files with 15 additions and 0 deletions

View File

@@ -1,3 +1,13 @@
2008-06-30 Matthias Clasen <mclasen@redhat.com>
Backport from trunk:
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-30 Matthias Clasen <mclasen@redhat.com>
Backport from trunk:

View File

@@ -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
}
/**