In XBT_LOG_NEW_SUBCATEGORY_helper, protect function declaration with SG_{BEGIN,END...

[simgrid.git] / include / xbt / heap.h

diff --git a/include/xbt/heap.h b/include/xbt/heap.h
index 16f5126..cc50c02 100644 (file)
--- 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. 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. */
@@ -17,9 +16,13 @@
  *  @{
  */
 /* @brief heap datatype */
+#ifdef __cplusplus
+extern "C" {
+#endif
 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 +31,13 @@ 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);
+#ifdef __cplusplus
+}
+#endif
 /* @} */
-#endif /* _XBT_HEAP_H */
+#endif                          /* _XBT_HEAP_H */