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 pull request #59 from fabienchaix/master
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
c782e81
..
2a86c80
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-130,7
+130,7
@@
s_surf_model_description_t surf_storage_model_description[] = {
{NULL, NULL, NULL} /* this array must be NULL terminated */
};
-#ifdef
CONTEXT_THREAD
S
+#ifdef
HAVE_THREAD_CONTEXT
S
static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
#endif
@@
-373,7
+373,7
@@
void surf_exit(void)
future_evt_set = nullptr;
}
-#ifdef
CONTEXT_THREAD
S
+#ifdef
HAVE_THREAD_CONTEXT
S
xbt_parmap_destroy(surf_parmap);
#endif
@@
-801,7
+801,7
@@
void Action::setPriority(double priority)
lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority);
if (getModel()->getUpdateMechanism() == UM_LAZY)
-
heapRemove(getModel()->getActionHeap());
+ heapRemove(getModel()->getActionHeap());
XBT_OUT();
}