X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4725d7a4bc5ac1fdae3e86222cdc23eaaf6fb226..487f1bbd1b94a8738f06e84815ad0eef6d5e7525:/src/xbt/dict_private.h diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h index d384580043..c1b6402a69 100644 --- a/src/xbt/dict_private.h +++ b/src/xbt/dict_private.h @@ -1,9 +1,8 @@ -/* $Id$ */ - /* dict_elm - elements of generic dictionnaries */ /* This file is not to be loaded from anywhere but dict.c */ -/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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. */ @@ -23,6 +22,7 @@ typedef struct xbt_dictelm_ *xbt_dictelm_t; #define MAX_FILL_PERCENT 80 typedef struct xbt_dictelm_ { + int dictielem:1; char *key; int key_len; unsigned int hash_code; @@ -43,14 +43,17 @@ typedef struct xbt_dict_ { typedef struct xbt_dict_cursor_ s_xbt_dict_cursor_t; extern xbt_mallocator_t dict_elm_mallocator; -extern void* dict_elm_mallocator_new_f(void); -extern void dict_elm_mallocator_free_f(void* elem); -extern void dict_elm_mallocator_reset_f(void* elem); +extern void *dict_elm_mallocator_new_f(void); +extern void dict_elm_mallocator_free_f(void *elem); +extern void dict_elm_mallocator_reset_f(void *elem); /*####[ Function prototypes ]################################################*/ -xbt_dictelm_t xbt_dictelm_new(const char *key, int key_len, unsigned int hash_code, - void *content, void_f_pvoid_t free_f); +xbt_dictelm_t xbt_dictelm_new(const char *key, int key_len, + unsigned int hash_code, void *content, + void_f_pvoid_t free_f); +xbt_dictelm_t xbt_dictielm_new(uintptr_t key, unsigned int hash_code, + uintptr_t content); void xbt_dictelm_free(xbt_dictelm_t element); void xbt_dict_add_element(xbt_dict_t dict, xbt_dictelm_t element); -#endif /* _XBT_DICT_PRIVATE_H_ */ +#endif /* _XBT_DICT_PRIVATE_H_ */