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 back the master trunk into the smpi branch
[simgrid.git]
/
src
/
simix
/
smx_context.c
diff --git
a/src/simix/smx_context.c
b/src/simix/smx_context.c
index
6423cd6
..
c3632ff
100644
(file)
--- a/
src/simix/smx_context.c
+++ b/
src/simix/smx_context.c
@@
-1,6
+1,6
@@
/* a fast and simple context switching library */
/* a fast and simple context switching library */
-/* Copyright (c) 2009
, 2010
. The SimGrid Team.
+/* Copyright (c) 2009
- 2011
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-143,7
+143,7
@@
XBT_INLINE void SIMIX_context_set_nthreads(int nb_threads) {
if (nb_threads > 1) {
#ifndef CONTEXT_THREADS
if (nb_threads > 1) {
#ifndef CONTEXT_THREADS
- THROWF(arg_error, 0, "
No thread support for parallel context execution
");
+ THROWF(arg_error, 0, "
The thread factory cannot be run in parallel
");
#endif
}
#endif
}