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
Drop xbt_str_split().
[simgrid.git]
/
src
/
xbt
/
dynar.cpp
diff --git
a/src/xbt/dynar.cpp
b/src/xbt/dynar.cpp
index 31bbef2572365aee9730222cdc54c34850a66121..cab503ccf6025a2c222b094763ad3dc7e85b1e9f 100644
(file)
--- a/
src/xbt/dynar.cpp
+++ b/
src/xbt/dynar.cpp
@@
-59,7
+59,7
@@
static inline void _xbt_dynar_expand(xbt_dynar_t dynar, unsigned long nb)
static inline void* _xbt_dynar_elm(const_xbt_dynar_t dynar, unsigned long idx)
{
static inline void* _xbt_dynar_elm(const_xbt_dynar_t dynar, unsigned long idx)
{
-
char *const data = (char *) dynar->data
;
+
auto* const data = static_cast<char*>(dynar->data)
;
const unsigned long elmsize = dynar->elmsize;
return data + idx * elmsize;
const unsigned long elmsize = dynar->elmsize;
return data + idx * elmsize;
@@
-160,7
+160,7
@@
void xbt_dynar_free(xbt_dynar_t* dynar)
*/
unsigned long xbt_dynar_length(const_xbt_dynar_t dynar)
{
*/
unsigned long xbt_dynar_length(const_xbt_dynar_t dynar)
{
- return (dynar ?
(unsigned long) dynar->used : (unsigned long) 0
);
+ return (dynar ?
dynar->used : 0UL
);
}
/**@brief check if a dynar is empty
}
/**@brief check if a dynar is empty
@@
-300,9
+300,7
@@
void xbt_dynar_remove_at(xbt_dynar_t dynar, int idx, void* object)
*/
signed int xbt_dynar_search_or_negative(const_xbt_dynar_t dynar, const void* elem)
{
*/
signed int xbt_dynar_search_or_negative(const_xbt_dynar_t dynar, const void* elem)
{
- unsigned long it;
-
- for (it = 0; it < dynar->used; it++)
+ for (unsigned long it = 0; it < dynar->used; it++)
if (not memcmp(_xbt_dynar_elm(dynar, it), elem, dynar->elmsize)) {
return it;
}
if (not memcmp(_xbt_dynar_elm(dynar, it), elem, dynar->elmsize)) {
return it;
}
@@
-317,9
+315,7
@@
signed int xbt_dynar_search_or_negative(const_xbt_dynar_t dynar, const void* ele
*/
int xbt_dynar_member(const_xbt_dynar_t dynar, const void* elem)
{
*/
int xbt_dynar_member(const_xbt_dynar_t dynar, const void* elem)
{
- unsigned long it;
-
- for (it = 0; it < dynar->used; it++)
+ for (unsigned long it = 0; it < dynar->used; it++)
if (not memcmp(_xbt_dynar_elm(dynar, it), elem, dynar->elmsize)) {
return 1;
}
if (not memcmp(_xbt_dynar_elm(dynar, it), elem, dynar->elmsize)) {
return 1;
}
@@
-391,15
+387,14
@@
void xbt_dynar_shift(xbt_dynar_t dynar, void* dst)
*/
void xbt_dynar_map(const_xbt_dynar_t dynar, void_f_pvoid_t op)
{
*/
void xbt_dynar_map(const_xbt_dynar_t dynar, void_f_pvoid_t op)
{
-
char *const data = (char *) dynar->data
;
+
auto* const data = static_cast<char*>(dynar->data)
;
const unsigned long elmsize = dynar->elmsize;
const unsigned long used = dynar->used;
const unsigned long elmsize = dynar->elmsize;
const unsigned long used = dynar->used;
- unsigned long i;
_sanity_check_dynar(dynar);
_sanity_check_dynar(dynar);
- for (i = 0; i < used; i++) {
- char* elm =
(char*)
data + i * elmsize;
+ for (
unsigned long
i = 0; i < used; i++) {
+ char* elm = data + i * elmsize;
op(elm);
}
}
op(elm);
}
}