[mc] Move code in simgrid::mc

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

diff --git a/src/xbt/heap.c b/src/xbt/heap.c
index 144d9e6..469cc68 100644 (file)
--- a/src/xbt/heap.c
+++ b/src/xbt/heap.c
@@ -28,7 +28,7 @@ static void xbt_heap_increase_key(xbt_heap_t H, int i);
  *
  * Creates a new heap.
  */
-XBT_INLINE xbt_heap_t xbt_heap_new(int init_size,
+inline 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);
@@ -44,7 +44,7 @@ XBT_INLINE xbt_heap_t xbt_heap_new(int init_size,
  * @param H the heap we're working on
  * \param update_callback function to call on each element to update its index when needed.
  */
-XBT_INLINE void xbt_heap_set_update_callback(xbt_heap_t H,
+inline void xbt_heap_set_update_callback(xbt_heap_t H,
                                              void (*update_callback) (void
                                                                       *,
                                                                       int))
@@ -73,7 +73,7 @@ void xbt_heap_free(xbt_heap_t H)
  * @param H the heap we're working on
  * @return the number of elements in the heap
  */
-XBT_INLINE int xbt_heap_size(xbt_heap_t H)
+inline int xbt_heap_size(xbt_heap_t H)
 {
   return (H->count);
 }
@@ -174,12 +174,12 @@ void *xbt_heap_remove(xbt_heap_t H, int i)
  *  @param key the key associated to this object
  */
 void xbt_heap_rm_elm(xbt_heap_t H, void *content, double key) {
-       int i=0;
-       while (i < H->count && (KEY(H, i) != key || CONTENT(H, i) != content))
-               i++;
-       if (i == H->count)
-               return;
-       xbt_heap_remove(H,i);
+  int i=0;
+  while (i < H->count && (KEY(H, i) != key || CONTENT(H, i) != content))
+    i++;
+  if (i == H->count)
+    return;
+  xbt_heap_remove(H,i);
 }
 
 /**
@@ -212,7 +212,7 @@ void xbt_heap_update(xbt_heap_t H, int i, double key)
  *
  * \return the smallest key in the heap without modifying the heap.
  */
-XBT_INLINE double xbt_heap_maxkey(xbt_heap_t H)
+inline double xbt_heap_maxkey(xbt_heap_t H)
 {
   xbt_assert(H->count != 0, "Empty heap");
   return KEY(H, 0);