From: Arnaud Giersch Date: Thu, 5 Dec 2013 13:53:16 +0000 (+0100) Subject: Make prototype match overloaded function from class NetworkModel. X-Git-Tag: v3_11_beta~190 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/129188ec404d7b0aa0bacafd9e2a8d26ed37183a?ds=sidebyside Make prototype match overloaded function from class NetworkModel. Fixes Clang warning. --- diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index bd8821aca5..fe939b68a0 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -52,7 +52,6 @@ public: e_surf_link_sharing_policy_t policy, xbt_dict_t properties); void updateActionsStateLazy(double now, double delta); - void gapAppend(double /*size*/, const NetworkCm02LinkLmmPtr /*link*/, NetworkCm02ActionLmmPtr /*action*/) {}; ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate); }; diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index 8f707a5df9..6d52fc76e2 100644 --- a/src/surf/network_smpi.cpp +++ b/src/surf/network_smpi.cpp @@ -99,7 +99,7 @@ NetworkSmpiModel::~NetworkSmpiModel(){ } } -void NetworkSmpiModel::gapAppend(double size, const NetworkCm02LinkLmmPtr link, NetworkCm02ActionLmmPtr action) +void NetworkSmpiModel::gapAppend(double size, const NetworkLinkLmmPtr link, NetworkActionLmmPtr action) { const char *src = link->m_name; xbt_fifo_t fifo; diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp index e16ba5e2c0..9f7e80921e 100644 --- a/src/surf/network_smpi.hpp +++ b/src/surf/network_smpi.hpp @@ -20,7 +20,7 @@ public: NetworkSmpiModel(); ~NetworkSmpiModel(); - void gapAppend(double size, const NetworkCm02LinkLmmPtr link, NetworkCm02ActionLmmPtr action); + void gapAppend(double size, const NetworkLinkLmmPtr link, NetworkActionLmmPtr action); void gapRemove(ActionLmmPtr action); double latencyFactor(double size); double bandwidthFactor(double size);