X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a8cd62135619ad52e05ae1c929ef07e166e4260..4bd1f48f0bf1ad1703be680ec2a38d626c6a2668:/src/xbt/dict_private.h

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index 77292d1b4a..83798fb81c 100644
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -1,15 +1,15 @@
 /* dict_elm - elements of generic dictionnaries                             */
-/* This file is not to be loaded from anywhere but dict.c                   */
+/* This file is not to be loaded from anywhere but dict.cpp                 */
 
-/* Copyright (c) 2004-2011. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2017. 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. */
 
-#ifndef _XBT_DICT_PRIVATE_H__
-#define _XBT_DICT_PRIVATE_H__
+#ifndef XBT_DICT_PRIVATE_H
+#define XBT_DICT_PRIVATE_H
 
+#include "xbt/base.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/ex.h"
@@ -17,13 +17,9 @@
 #include "xbt/dict.h"
 #include "xbt/mallocator.h"
 
-#define MAX_FILL_PERCENT 80
-
+SG_BEGIN_DECL()
 
-typedef struct s_xbt_het_dictelm {
-  s_xbt_dictelm_t element;
-  void_f_pvoid_t free_f;
-} s_xbt_het_dictelm_t, *xbt_het_dictelm_t;
+#define MAX_FILL_PERCENT 80
 
 typedef struct s_xbt_dict {
   void_f_pvoid_t free_f;
@@ -36,22 +32,16 @@ typedef struct s_xbt_dict {
 
 typedef struct s_xbt_dict_cursor s_xbt_dict_cursor_t;
 
-extern xbt_mallocator_t dict_elm_mallocator;
-extern void *dict_elm_mallocator_new_f(void);
+extern XBT_PRIVATE xbt_mallocator_t dict_elm_mallocator;
+XBT_PRIVATE void * dict_elm_mallocator_new_f(void);
 #define dict_elm_mallocator_free_f xbt_free_f
 #define dict_elm_mallocator_reset_f ((void_f_pvoid_t)NULL)
 
-extern xbt_mallocator_t dict_het_elm_mallocator;
-extern void *dict_het_elm_mallocator_new_f(void);
-#define dict_het_elm_mallocator_free_f xbt_free_f
-#define dict_het_elm_mallocator_reset_f ((void_f_pvoid_t)NULL)
-
 /*####[ Function prototypes ]################################################*/
-xbt_dictelm_t xbt_dictelm_new(xbt_dict_t dict, const char *key, int key_len,
-                              unsigned int hash_code, void *content,
-                              void_f_pvoid_t free_f);
-void xbt_dictelm_free(xbt_dict_t dict, xbt_dictelm_t element);
-void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element,
-                          void *data, void_f_pvoid_t free_ctn);
-
-#endif                          /* _XBT_DICT_PRIVATE_H_ */
+XBT_PRIVATE xbt_dictelm_t xbt_dictelm_new(const char* key, int key_len, unsigned int hash_code, void* content);
+XBT_PRIVATE void xbt_dictelm_free(xbt_dict_t dict, xbt_dictelm_t element);
+XBT_PRIVATE void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element, void *data, void_f_pvoid_t free_ctn);
+
+SG_END_DECL()
+
+#endif