Merge commit '045db1657e870c721be490b411868f4181a12ced' into surf++

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

diff --git a/include/xbt/heap.h b/include/xbt/heap.h
index ab20dfea89f7cd4a9664813187ea270dfcbbbe7f..cc50c023a3ad30fad7758c611294e744d0cfb95b 100644 (file)
--- a/include/xbt/heap.h
+++ b/include/xbt/heap.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team.
+/* 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
@@ -16,9 +16,12 @@
  *  @{
  */
 /* @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,
+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);
@@ -33,6 +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
 /* @} */
 #endif                          /* _XBT_HEAP_H */