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
Merge branch 'master' into S4U
[simgrid.git]
/
include
/
xbt
/
heap.h
diff --git
a/include/xbt/heap.h
b/include/xbt/heap.h
index
02fdf0d
..
0c758e9
100644
(file)
--- a/
include/xbt/heap.h
+++ b/
include/xbt/heap.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-2007, 2009-2011, 2013-201
4
. The SimGrid Team.
+/* Copyright (c) 2004-2007, 2009-2011, 2013-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-27,6
+27,7
@@
XBT_PUBLIC(int) xbt_heap_size(xbt_heap_t H);
XBT_PUBLIC(void) xbt_heap_push(xbt_heap_t H, void *content, double key);
XBT_PUBLIC(void *) xbt_heap_pop(xbt_heap_t H);
XBT_PUBLIC(void) xbt_heap_push(xbt_heap_t H, void *content, double key);
XBT_PUBLIC(void *) xbt_heap_pop(xbt_heap_t H);
+XBT_PUBLIC(void) xbt_heap_rm_elm(xbt_heap_t H, void *content, double key);
XBT_PUBLIC(double) xbt_heap_maxkey(xbt_heap_t H);
XBT_PUBLIC(void *) xbt_heap_maxcontent(xbt_heap_t H);
XBT_PUBLIC(double) xbt_heap_maxkey(xbt_heap_t H);
XBT_PUBLIC(void *) xbt_heap_maxcontent(xbt_heap_t H);
@@
-35,6
+36,8
@@
XBT_PUBLIC(void) xbt_heap_set_update_callback(xbt_heap_t H,
*,
int));
XBT_PUBLIC(void *) xbt_heap_remove(xbt_heap_t H, int i);
*,
int));
XBT_PUBLIC(void *) xbt_heap_remove(xbt_heap_t H, int i);
+XBT_PUBLIC(void ) xbt_heap_update(xbt_heap_t H, int i, double key);
+
/* @} */
SG_END_DECL()
#endif /* _XBT_HEAP_H */
/* @} */
SG_END_DECL()
#endif /* _XBT_HEAP_H */