X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/69df130a50b94f86e4ef3fae61b68bfa2bbaccca..23244e6abc0ffce10651b283c8955a63b86fe303:/src/xbt/dict_multi.c diff --git a/src/xbt/dict_multi.c b/src/xbt/dict_multi.c index e6152046b4..a6f8887301 100644 --- a/src/xbt/dict_multi.c +++ b/src/xbt/dict_multi.c @@ -6,6 +6,8 @@ /* 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. */ +#ifdef XBT_USE_DEPRECATED + #include "dict_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_multi, xbt_dict, @@ -125,7 +127,7 @@ void *xbt_multidict_get_ext(xbt_dict_t mdict, int keys_len = xbt_dynar_length(keys); xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens)); - xbt_assert(xbt_dynar_length(keys) >= 1, + xbt_assert(!xbt_dynar_is_empty(keys), "Can't get a zero-long key set in a multidict"); XBT_DEBUG("xbt_multidict_get(%p, %ld)", mdict, xbt_dynar_length(keys)); @@ -185,7 +187,7 @@ xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, { volatile xbt_dict_t thislevel; volatile xbt_dict_t nextlevel = NULL; - int i; + volatile int i; xbt_ex_t e; unsigned long int thislen; @@ -242,3 +244,5 @@ void xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys) RETHROW; } } + +#endif