X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/965056e4f95159e78816eca6edc8982928097b73..e9b1194a39ec83337fda159056c0ab8bd52a952e:/include/xbt/heap.h diff --git a/include/xbt/heap.h b/include/xbt/heap.h index e0ddfb8dd3..4d9ef1d889 100644 --- a/include/xbt/heap.h +++ b/include/xbt/heap.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2007, 2009-2011, 2013-2014. 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 @@ -20,20 +20,17 @@ SG_BEGIN_DECL() /* @brief heap datatype */ typedef struct xbt_heap *xbt_heap_t; -XBT_PUBLIC(xbt_heap_t) xbt_heap_new(int init_size, - 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); 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(void) xbt_heap_set_update_callback(xbt_heap_t H, - void (*update_callback) (void - *, - int)); +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_update(xbt_heap_t H, int i, double key);