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

diff --git a/ChangeLog b/ChangeLog
index 52a3d50..ba28ad4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 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
        by G_STRFUNC.  (#524344, Peter, Kjellerstedt)

diff --git a/glib/ghash.c b/glib/ghash.c
index 62df5b9..af81f5a 100644 (file)
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -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;