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
Fix initialization order.
[simgrid.git]
/
src
/
surf
/
vm_workstation.cpp
diff --git
a/src/surf/vm_workstation.cpp
b/src/surf/vm_workstation.cpp
index
fe17e16
..
aa743cf
100644
(file)
--- a/
src/surf/vm_workstation.cpp
+++ b/
src/surf/vm_workstation.cpp
@@
-181,10
+181,10
@@
double WorkstationVMModel::shareResources(double now)
WorkstationVM2013Lmm::WorkstationVM2013Lmm(WorkstationVMModelPtr model, const char* name, xbt_dict_t props,
surf_resource_t ind_phys_workstation)
WorkstationVM2013Lmm::WorkstationVM2013Lmm(WorkstationVMModelPtr model, const char* name, xbt_dict_t props,
surf_resource_t ind_phys_workstation)
- : WorkstationVM2013(model, name, props, NULL, NULL),
- WorkstationCLM03Lmm(model, name, props, NULL, NULL, NULL),
+ : Resource(model, name, props),
WorkstationCLM03(model, name, props, NULL, NULL, NULL),
WorkstationCLM03(model, name, props, NULL, NULL, NULL),
- Resource(model, name, props) {
+ WorkstationVM2013(model, name, props, NULL, NULL),
+ WorkstationCLM03Lmm(model, name, props, NULL, NULL, NULL) {
WorkstationCLM03Ptr sub_ws = dynamic_cast<WorkstationCLM03Ptr>(
static_cast<ResourcePtr>(
surf_workstation_resource_priv(ind_phys_workstation)));
WorkstationCLM03Ptr sub_ws = dynamic_cast<WorkstationCLM03Ptr>(
static_cast<ResourcePtr>(
surf_workstation_resource_priv(ind_phys_workstation)));