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

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=/trunk/; revision=6777
This commit is contained in:
Matthias Clasen 2008-03-31 03:45:28 +00:00 committed by Matthias Clasen
parent b9cc70aaa8
commit 7250e1dafd
2 changed files with 9 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2008-03-30 Matthias Clasen <mclasen@redhat.com>
* glib/ghash.c: Fix the build with -DG_DISABLE_ASSERT.
(#525060, Arfrever Frehtes Taifersar Arahesis)
2008-03-30 Matthias Clasen <mclasen@redhat.com>
* glib/gthread.h: Replace occurrances of G_GNUC_PRETTY_FUNCTION

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;