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
routing stuff in SimDag is dead code added by navarrop (nobody ever used
[simgrid.git]
/
include
/
xbt
/
heap.h
diff --git
a/include/xbt/heap.h
b/include/xbt/heap.h
index
b6e9689
..
0c758e9
100644
(file)
--- a/
include/xbt/heap.h
+++ b/
include/xbt/heap.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004
, 2005, 2006, 2007, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2004
-2007, 2009-2011, 2013-2015
. 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
@@
-10,6
+10,8
@@
#include "xbt/misc.h"
#include "xbt/dynar.h" /* void_f_pvoid_t */
#include "xbt/misc.h"
#include "xbt/dynar.h" /* void_f_pvoid_t */
+SG_BEGIN_DECL()
+
/** @addtogroup XBT_heap
* @brief This section describes the API to generic heap with O(log(n)) access.
*
/** @addtogroup XBT_heap
* @brief This section describes the API to generic heap with O(log(n)) access.
*
@@
-25,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);
@@
-33,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 */
#endif /* _XBT_HEAP_H */