X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9df6a0ce7023e4e22d83bb6c50f27bd21fab329..4a69abcc786d029bd2962537f767d12a0f808d11:/src/xbt/dict_private.h diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h index 317177f186..98f4adbfa2 100644 --- a/src/xbt/dict_private.h +++ b/src/xbt/dict_private.h @@ -1,14 +1,13 @@ /* dict_elm - elements of generic dictionnaries */ -/* This file is not to be loaded from anywhere but dict.cpp */ +/* This file is not to be loaded from anywhere but dict.cpp */ -/* Copyright (c) 2004-2011, 2013-2014. 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" @@ -25,7 +24,8 @@ 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; +} s_xbt_het_dictelm_t; +typedef s_xbt_het_dictelm_t* xbt_het_dictelm_t; typedef struct s_xbt_dict { void_f_pvoid_t free_f; @@ -39,12 +39,12 @@ typedef struct s_xbt_dict { 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(); +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_PRIVATE xbt_mallocator_t dict_het_elm_mallocator; -extern XBT_PRIVATE void * dict_het_elm_mallocator_new_f(); +extern XBT_PRIVATE 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) @@ -56,4 +56,4 @@ XBT_PRIVATE void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element, vo SG_END_DECL() -#endif /* _XBT_DICT_PRIVATE_H_ */ +#endif