Merge branch 'coverity_scan' of github.com:mquinson/simgrid

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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 836a8c4..6114f6f 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -31,7 +31,7 @@ void surf_network_model_init_Constant()
 namespace simgrid {
 namespace surf {
 
-double NetworkConstantModel::shareResources(double /*now*/)
+double NetworkConstantModel::next_occuring_event(double /*now*/)
 {
   NetworkConstantAction *action = NULL;
   double min = -1.0;
@@ -80,8 +80,8 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
 Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
     double size, double rate)
 {
-  char *src_name = src->getName();
-  char *dst_name = dst->getName();
+  char *src_name = src->name();
+  char *dst_name = dst->name();
 
   XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
   NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);