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 with master and fix conflicts
[simgrid.git]
/
examples
/
msg
/
priority
/
priority.c
diff --git
a/examples/msg/priority/priority.c
b/examples/msg/priority/priority.c
index
8690ec5
..
f82d132
100644
(file)
--- a/
examples/msg/priority/priority.c
+++ b/
examples/msg/priority/priority.c
@@
-26,7
+26,7
@@
static int test(int argc, char *argv[])
{
double computation_amount = 0.0;
double priority = 1.0;
- m_task_t task = NULL;
+ m
sg
_task_t task = NULL;
_XBT_GNUC_UNUSED int res = sscanf(argv[1], "%lg", &computation_amount);
xbt_assert(res, "Invalid argument %s\n", argv[1]);
@@
-45,10
+45,10
@@
static int test(int argc, char *argv[])
return 0;
}
-static
MSG
_error_t test_all(const char *platform_file,
+static
msg
_error_t test_all(const char *platform_file,
const char *application_file)
{
-
MSG
_error_t res = MSG_OK;
+
msg
_error_t res = MSG_OK;
{ /* Simulation setting */
MSG_create_environment(platform_file);
@@
-65,7
+65,7
@@
static MSG_error_t test_all(const char *platform_file,
int main(int argc, char *argv[])
{
-
MSG
_error_t res = MSG_OK;
+
msg
_error_t res = MSG_OK;
#ifdef _MSC_VER
unsigned int prev_exponent_format =
@@
-80,7
+80,6
@@
int main(int argc, char *argv[])
exit(1);
}
res = test_all(argv[1], argv[2]);
- MSG_clean();
#ifdef _MSC_VER
_set_output_format(prev_exponent_format);