A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid to recompile automatonparse_promela.c at each build (maintainer mode).
[simgrid.git]
/
src
/
xbt
/
dict_multi.c
diff --git
a/src/xbt/dict_multi.c
b/src/xbt/dict_multi.c
index
6dc05e0
..
a6f8887
100644
(file)
--- 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. */
/* 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,
#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));
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));
"Can't get a zero-long key set in a multidict");
XBT_DEBUG("xbt_multidict_get(%p, %ld)", mdict, xbt_dynar_length(keys));
@@
-183,8
+185,9
@@
void
xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys,
xbt_dynar_t lens)
{
xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys,
xbt_dynar_t lens)
{
- xbt_dict_t thislevel, nextlevel = NULL;
- int i;
+ volatile xbt_dict_t thislevel;
+ volatile xbt_dict_t nextlevel = NULL;
+ volatile int i;
xbt_ex_t e;
unsigned long int thislen;
xbt_ex_t e;
unsigned long int thislen;
@@
-241,3
+244,5
@@
void xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys)
RETHROW;
}
}
RETHROW;
}
}
+
+#endif