X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e2c8aeab0ec45fb9945018b9de3cab5c1019875..4493d506bea568ad5f4a4bb96bab54bd9966bf29:/src/surf/network_constant.hpp diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp index f9b8605333..984779569d 100644 --- a/src/surf/network_constant.hpp +++ b/src/surf/network_constant.hpp @@ -21,7 +21,6 @@ typedef NetworkConstantActionLmm *NetworkConstantActionLmmPtr; class NetworkConstantModel : public NetworkCm02Model { public: NetworkConstantModel() : NetworkCm02Model("constant time network") {}; - NetworkCm02LinkLmmPtr createResource(string name); double shareResources(double now); void updateActionsState(double now, double delta); ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst, @@ -48,11 +47,11 @@ public: **********/ class NetworkConstantActionLmm : public NetworkCm02ActionLmm { public: - NetworkConstantActionLmm(NetworkConstantModelPtr model, double size, double latency): - Action(model, size, false), NetworkCm02ActionLmm(model, 0, false), m_latInit(latency) { + NetworkConstantActionLmm(NetworkConstantModelPtr model_, double size, double latency): + Action(model_, size, false), NetworkCm02ActionLmm(model_, 0, false), m_latInit(latency) { m_latency = latency; if (m_latency <= 0.0) { - p_stateSet = p_model->p_doneActionSet; + p_stateSet = getModel()->getDoneActionSet(); xbt_swag_insert(static_cast(this), p_stateSet); } };