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

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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 836a8c4..533be80 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -6,9 +6,6 @@
 
 #include "network_constant.hpp"
 
-#include "host_interface.hpp"
-#include "src/surf/platform.hpp"
-
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
 /*********
@@ -31,7 +28,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 +77,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);