luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-28 11:54:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the build with -DG_DISABLE_ASSERT. (#525060, Arfrever Frehtes

Browse Source 
2008-03-30  Matthias Clasen  <mclasen@redhat.com>

        * glib/ghash.c: Fix the build with -DG_DISABLE_ASSERT.
        (#525060, Arfrever Frehtes Taifersar Arahesis)

svn path=/branches/glib-2-16/; revision=6778
This commit is contained in:
Matthias Clasen
2008-03-31 03:46:32 +00:00
committed by Matthias Clasen
parent 2f04b46e18
commit 6d4536b293
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2008-03-30 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:
* glib/ghash.c: Fix the build with -DG_DISABLE_ASSERT.
(#525060, Arfrever Frehtes Taifersar Arahesis)
2008-03-30 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:

4
glib/ghash.c
View File

@@ -422,7 +422,9 @@ g_hash_table_iter_next (GHashTableIter *iter,
RealIter *ri = (RealIter *) iter;
g_return_val_if_fail (iter != NULL, FALSE);
#ifndef G_DISABLE_ASSERT
g_return_val_if_fail (ri->version == ri->hash_table->version, FALSE);
#endif
if (ri->pre_advanced)
{
@@ -484,7 +486,9 @@ iter_remove_or_steal (RealIter *ri, gboolean notify)
int position;
g_return_if_fail (ri != NULL);
#ifndef G_DISABLE_ASSERT
g_return_if_fail (ri->version == ri->hash_table->version);
#endif
g_return_if_fail (ri->node != NULL);
prev = ri->prev_node;