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
build with verbosity
[simgrid.git]
/
src
/
xbt
/
dict_multi.c
diff --git
a/src/xbt/dict_multi.c
b/src/xbt/dict_multi.c
index 20d118548315473847d6a1349c0d5254a703c82d..a8ef163d028964178ead4e778579644492424533 100644
(file)
--- a/
src/xbt/dict_multi.c
+++ b/
src/xbt/dict_multi.c
@@
-1,11
+1,13
@@
/* dict_multi - dictionnaries of dictionnaries of ... of data */
/* dict_multi - dictionnaries of dictionnaries of ... of data */
-/* Copyright (c) 2004
, 2005, 2006, 2007, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2004
-2014
. 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. */
* 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. */
+#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));
@@
-242,3
+244,5
@@
void xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys)
RETHROW;
}
}
RETHROW;
}
}
+
+#endif