Gcc is *very* permissive with pointers to functions. If we declare them as function...

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

diff --git a/src/xbt/heap.c b/src/xbt/heap.c
index 1357fce..747b2e3 100644 (file)
--- a/src/xbt/heap.c
+++ b/src/xbt/heap.c
@@ -11,6 +11,8 @@
 #include "xbt/log.h"
 #include "heap_private.h"
 
+#include <stdio.h>
+
 
 /** @addtogroup XBT_heap 
  *  \brief This section describes the API to generic heap with O(log(n)) access.
@@ -24,7 +26,7 @@
  *
  * Creates a new heap.
  */
-xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t * const free_func)
+xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t const free_func)
 {
   xbt_heap_t H = xbt_new0(struct xbt_heap, 1);
   H->size = init_size;
@@ -43,7 +45,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;
@@ -69,20 +71,21 @@ int xbt_heap_size(xbt_heap_t H)
  */
 void xbt_heap_push(xbt_heap_t H, void *content, double key)
 {
-  int count = ++(H->count);
-  int size = H->size;
-  xbt_heapItem_t item;
-  if (count > size) {
-    H->size = 2 * size + 1;
-    H->items =
-       (void *) realloc(H->items,
-                        (H->size) * sizeof(struct xbt_heapItem));
-  }
-  item = &(H->items[count - 1]);
-  item->key = key;
-  item->content = content;
-  xbt_heap_increaseKey(H, count - 1);
-  return;
+       int count = ++(H->count);
+
+       int size = H->size;
+       xbt_heapItem_t item;
+       
+       if (count > size) {
+               H->size = 2 * size + 1;
+               H->items =(void *) realloc(H->items,(H->size) * sizeof(struct xbt_heapItem));
+       }
+       
+       item = &(H->items[count - 1]);
+       item->key = key;
+       item->content = content;
+       xbt_heap_increaseKey(H, count - 1);
+       return;
 }
 
 /**