/* a generic and efficient heap */
-/* Copyright (c) 2004-2005, 2007-2014. The SimGrid Team.
+/* Copyright (c) 2004-2005, 2007-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
*
* 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);
* @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))
* @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);
}
* @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);
}
/**
*
* \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);