X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/976ee462f4626798ebf76ca46d13f53e10e0e28d..72aca2e8034f48eff3b88af1a171a56e3010b57d:/include/xbt/heap.h diff --git a/include/xbt/heap.h b/include/xbt/heap.h index 16f51264d9..02fdf0d7c0 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-2007, 2009-2011, 2013-2014. 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. */ @@ -11,6 +10,8 @@ #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. * @@ -19,7 +20,8 @@ /* @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 init_size, + 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); @@ -28,8 +30,11 @@ 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_set_update_callback(xbt_heap_t H, void (*update_callback)(void*, int)); -XBT_PUBLIC(void*) xbt_heap_remove(xbt_heap_t H, int i); - +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 */ +SG_END_DECL() +#endif /* _XBT_HEAP_H */