X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/281f8c29e177852dcb1591fc31e363e1176857c8..666767f623cc55cc4524e84c4fe0f64b3dbd8bf9:/include/xbt/heap.h diff --git a/include/xbt/heap.h b/include/xbt/heap.h index cc50c023a3..0c758e9666 100644 --- a/include/xbt/heap.h +++ b/include/xbt/heap.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2007, 2009-2011. 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 @@ -10,15 +10,14 @@ #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. * * @{ */ /* @brief heap datatype */ -#ifdef __cplusplus -extern "C" { -#endif typedef struct xbt_heap *xbt_heap_t; XBT_PUBLIC(xbt_heap_t) xbt_heap_new(int init_size, @@ -28,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_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); @@ -36,8 +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); -#ifdef __cplusplus -} -#endif +XBT_PUBLIC(void ) xbt_heap_update(xbt_heap_t H, int i, double key); + /* @} */ +SG_END_DECL() #endif /* _XBT_HEAP_H */