A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model-checker : improve stack ignore in heap comparison algorithm
[simgrid.git]
/
src
/
xbt
/
heap.c
diff --git
a/src/xbt/heap.c
b/src/xbt/heap.c
index
5468fc3
..
d26166b
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++)
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;
free(H->items);
free(H);
return;
@@
-145,10
+145,10
@@
void *xbt_heap_pop(xbt_heap_t H)
/**
* @brief Extracts from the heap and returns the element at position i.
* \param H the heap we're working on
/**
* @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
*
* \return the element at position i if ok, NULL otherwise
*
- * Extracts from the heap and returns the element at position i. The hea
d
is automatically reorded.
+ * Extracts from the heap and returns the element at position i. The hea
p
is automatically reorded.
*/
void *xbt_heap_remove(xbt_heap_t H, int i)
{
*/
void *xbt_heap_remove(xbt_heap_t H, int i)
{
@@
-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_INLINE double xbt_heap_maxkey(xbt_heap_t H)
{
- xbt_assert
0
(H->count != 0, "Empty heap");
+ xbt_assert(H->count != 0, "Empty heap");
return KEY(H, 0);
}
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)
{
*/
void *xbt_heap_maxcontent(xbt_heap_t H)
{
- xbt_assert
0
(H->count != 0, "Empty heap");
+ xbt_assert(H->count != 0, "Empty heap");
return CONTENT(H, 0);
}
return CONTENT(H, 0);
}