X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd873505887849deebc1746f5cbee02f3d77ba8d..cf482439821f2e52d3a573c4abe8763be830800a:/src/xbt/dict_private.h diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h index 43d974f7a8..6d83ae4497 100644 --- a/src/xbt/dict_private.h +++ b/src/xbt/dict_private.h @@ -1,7 +1,7 @@ /* dict_elm - elements of generic dictionnaries */ /* This file is not to be loaded from anywhere but dict.cpp */ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2019. 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. */ @@ -19,29 +19,23 @@ SG_BEGIN_DECL() -#define MAX_FILL_PERCENT 80 - typedef struct s_xbt_dict { void_f_pvoid_t free_f; xbt_dictelm_t *table; int table_size; int count; int fill; - int homogeneous; } s_xbt_dict_t; -typedef struct s_xbt_dict_cursor s_xbt_dict_cursor_t; - 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) /*####[ Function prototypes ]################################################*/ -XBT_PRIVATE 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); +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); +XBT_PRIVATE void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element, void* data); SG_END_DECL()