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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
xbt
/
xbt_matrix.c
diff --git
a/src/xbt/xbt_matrix.c
b/src/xbt/xbt_matrix.c
index
80e60d3
..
d5f0417
100644
(file)
--- a/
src/xbt/xbt_matrix.c
+++ b/
src/xbt/xbt_matrix.c
@@
-47,7
+47,7
@@
void xbt_matrix_free(xbt_matrix_t mat)
if (mat) {
if (mat->free_f) {
for (i = 0; i < (mat->lines * mat->rows); i++) {
if (mat) {
if (mat->free_f) {
for (i = 0; i < (mat->lines * mat->rows); i++) {
-
(*(mat->free_f))
((void *) &(mat->data[i * mat->elmsize]));
+
mat->free_f
((void *) &(mat->data[i * mat->elmsize]));
}
}
free(mat->data);
}
}
free(mat->data);
@@
-78,7
+78,7
@@
void xbt_matrix_dump(xbt_matrix_t matrix, const char *name, int coords,
fprintf(stderr, " (%d,%d)=", i, j);
else
fprintf(stderr, " ");
fprintf(stderr, " (%d,%d)=", i, j);
else
fprintf(stderr, " ");
-
(*display_fun)
(xbt_matrix_get_ptr(matrix, i, j));
+
display_fun
(xbt_matrix_get_ptr(matrix, i, j));
}
fprintf(stderr, "\n");
}
}
fprintf(stderr, "\n");
}
@@
-128,7
+128,7
@@
void xbt_matrix_copy_values(xbt_matrix_t dst, xbt_matrix_t src,
if (cpy_f) {
for (j = 0; j < lsize; j++)
xbt_matrix_get_as(dst, j + lpos_dst, i + rpos_dst, void *) =
if (cpy_f) {
for (j = 0; j < lsize; j++)
xbt_matrix_get_as(dst, j + lpos_dst, i + rpos_dst, void *) =
-
(*cpy_f)
(xbt_matrix_get_ptr(src, j + rpos_src, i + lpos_src));
+
cpy_f
(xbt_matrix_get_ptr(src, j + rpos_src, i + lpos_src));
} else {
memcpy(xbt_matrix_get_ptr(dst, lpos_dst, i + rpos_dst),
xbt_matrix_get_ptr(src, lpos_src, i + rpos_src),
} else {
memcpy(xbt_matrix_get_ptr(dst, lpos_dst, i + rpos_dst),
xbt_matrix_get_ptr(src, lpos_src, i + rpos_src),