Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / src / xbt / heap.c

diff --git a/src/xbt/heap.c b/src/xbt/heap.c
index 5468fc3c969b4622356e523153de5eb822f2733e..a91e006bf95fdcacad780e300b5e2fa044e64edc 100644 (file)
--- a/src/xbt/heap.c
+++ b/src/xbt/heap.c
@@ -61,7 +61,7 @@ void xbt_heap_free(xbt_heap_t H)
   int i;
   if (H->free)
     for (i = 0; i < H->count; i++)
-      (*(H->free)) (H->items[i].content);
+      H->free(H->items[i].content);
   free(H->items);
   free(H);
   return;
@@ -171,7 +171,7 @@ void *xbt_heap_remove(xbt_heap_t H, int i)
  */
 XBT_INLINE double xbt_heap_maxkey(xbt_heap_t H)
 {
-  xbt_assert0(H->count != 0, "Empty heap");
+  xbt_assert(H->count != 0, "Empty heap");
   return KEY(H, 0);
 }
 
@@ -184,7 +184,7 @@ XBT_INLINE double xbt_heap_maxkey(xbt_heap_t H)
  */
 void *xbt_heap_maxcontent(xbt_heap_t H)
 {
-  xbt_assert0(H->count != 0, "Empty heap");
+  xbt_assert(H->count != 0, "Empty heap");
   return CONTENT(H, 0);
 }