merge conflicts

[simgrid.git] / src / xbt / dict_multi.c

diff --git a/src/xbt/dict_multi.c b/src/xbt/dict_multi.c
index e615204..0c2e692 100644 (file)
--- a/src/xbt/dict_multi.c
+++ b/src/xbt/dict_multi.c
@@ -125,7 +125,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 +185,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;