X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5319ffc7b1323889e1b8e2d88dd00e6a5f5b1372..ada64beec413781e8e11cc6106c5411962cac0fb:/include/xbt/heap.h diff --git a/include/xbt/heap.h b/include/xbt/heap.h index 8a21d6cf9b..ab20dfea89 100644 --- a/include/xbt/heap.h +++ b/include/xbt/heap.h @@ -1,6 +1,5 @@ -/* $Id$ */ - -/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -9,7 +8,7 @@ #define _XBT_HEAP_H #include "xbt/misc.h" -#include "xbt/dynar.h" /* void_f_pvoid_t */ +#include "xbt/dynar.h" /* void_f_pvoid_t */ /** @addtogroup XBT_heap * @brief This section describes the API to generic heap with O(log(n)) access. @@ -19,15 +18,21 @@ /* @brief heap datatype */ typedef struct xbt_heap *xbt_heap_t; -XBT_PUBLIC(xbt_heap_t) xbt_heap_new(int num, void_f_pvoid_t * const free_func); +XBT_PUBLIC(xbt_heap_t) xbt_heap_new(int num, + void_f_pvoid_t const free_func); XBT_PUBLIC(void) xbt_heap_free(xbt_heap_t H); 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_pop(xbt_heap_t H); XBT_PUBLIC(double) xbt_heap_maxkey(xbt_heap_t H); -XBT_PUBLIC(void*) xbt_heap_maxcontent(xbt_heap_t H); +XBT_PUBLIC(void *) xbt_heap_maxcontent(xbt_heap_t H); +XBT_PUBLIC(void) xbt_heap_set_update_callback(xbt_heap_t H, + void (*update_callback) (void + *, + int)); +XBT_PUBLIC(void *) xbt_heap_remove(xbt_heap_t H, int i); /* @} */ -#endif /* _XBT_HEAP_H */ +#endif /* _XBT_HEAP_H */