Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / surf / surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index fd6d09009aee7d06a4692d719aefb84aa8292ce9..726e0fded095281dd53e87d47839d25608a76c0f 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -663,21 +663,18 @@ Resource::Resource()
 {}
 
 Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props)
-  : m_stateCurrent(SURF_RESOURCE_ON)
-  , p_name(xbt_strdup(name)), p_properties(props), p_model(model)
-  , m_running(true)
+  : p_name(xbt_strdup(name)), p_properties(props), p_model(model)
+  , m_running(true), m_stateCurrent(SURF_RESOURCE_ON)
 {}
 
 Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props, lmm_constraint_t constraint)
-  : m_stateCurrent(SURF_RESOURCE_ON)
-  , p_name(xbt_strdup(name)), p_properties(props), p_model(model)
-  , m_running(true), p_constraint(constraint)
+  : p_name(xbt_strdup(name)), p_properties(props), p_model(model)
+  , m_running(true), m_stateCurrent(SURF_RESOURCE_ON), p_constraint(constraint)
 {}
 
 Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit)
-  : m_stateCurrent(stateInit)
-  , p_name(xbt_strdup(name)), p_properties(props), p_model(model)
-  , m_running(true)
+  : p_name(xbt_strdup(name)), p_properties(props), p_model(model)
+  , m_running(true), m_stateCurrent(stateInit)
 {}
 
 Resource::~Resource() {