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;
if (count > size) {
H->size = (size << 1) + 1;
H->items =
- (void *) realloc(H->items,
+ (void *) xbt_realloc(H->items,
(H->size) * sizeof(struct xbt_heap_item));
}
if (H->count < size >> 2 && size > 16) {
size = (size >> 1) + 1;
H->items =
- (void *) realloc(items,
+ (void *) xbt_realloc(items,
size * sizeof(struct xbt_heap_item));
H->size = size;
}
/**
* @brief Extracts from the heap and returns the element at position i.
* \param H the heap we're working on
- * \param i element position
+ * \param i element position
* \return the element at position i if ok, NULL otherwise
*
- * Extracts from the heap and returns the element at position i. The head is automatically reorded.
+ * Extracts from the heap and returns the element at position i. The heap is automatically reorded.
*/
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);
}
*/
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);
}