A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into MC_LTL
[simgrid.git]
/
src
/
xbt
/
dict.c
diff --git
a/src/xbt/dict.c
b/src/xbt/dict.c
index
c58f0c0
..
b0a5031
100644
(file)
--- a/
src/xbt/dict.c
+++ b/
src/xbt/dict.c
@@
-23,8
+23,8
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt,
static xbt_mallocator_t dict_mallocator = NULL;
static void *dict_mallocator_new_f(void);
static xbt_mallocator_t dict_mallocator = NULL;
static void *dict_mallocator_new_f(void);
-static void dict_mallocator_free_f(void *dict);
-static void dict_mallocator_reset_f(void *dict);
+#define dict_mallocator_free_f xbt_free_f
+#define dict_mallocator_reset_f ((void_f_pvoid_t)NULL)
/*####[ Code ]###############################################################*/
/*####[ Code ]###############################################################*/
@@
-32,7
+32,7
@@
static void dict_mallocator_reset_f(void *dict);
/**
* \brief Constructor
* \return pointer to the destination
/**
* \brief Constructor
* \return pointer to the destination
- * \see xbt_dict_
new_ext(), xbt_dict_
free()
+ * \see xbt_dict_free()
*
* Creates and initialize a new dictionary with a default hashtable size.
*/
*
* Creates and initialize a new dictionary with a default hashtable size.
*/
@@
-816,18
+816,6
@@
static void *dict_mallocator_new_f(void)
return xbt_new(s_xbt_dict_t, 1);
}
return xbt_new(s_xbt_dict_t, 1);
}
-static void dict_mallocator_free_f(void *dict)
-{
- xbt_free(dict);
-}
-
-static void dict_mallocator_reset_f(void *dict)
-{
- /* nothing to do because all fields are
- * initialized in xbt_dict_new
- */
-}
-
#ifdef SIMGRID_TEST
#include "xbt.h"
#include "xbt/ex.h"
#ifdef SIMGRID_TEST
#include "xbt.h"
#include "xbt/ex.h"