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 74c16786094ca9a4ec2d61dfa5688f5a11f02f59..bbf16a8372c7f622db1f8912251e6c3e0be36c77 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -17,20 +17,18 @@ void surf_network_model_init_Constant()
   surf_network_model = new simgrid::surf::NetworkConstantModel();
   all_existing_models->push_back(surf_network_model);
 
-  routing_model_create(nullptr);
+  routing_model_create();
 }
 
 namespace simgrid {
   namespace surf {
+  Link* NetworkConstantModel::createLink(const char* name, double bw, double lat, e_surf_link_sharing_policy_t policy)
+  {
 
-    NetworkConstantModel::~NetworkConstantModel() {}
-
-    Link* NetworkConstantModel::createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy,
-        xbt_dict_t properties) {
-
-      xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
-          "Please remove any link from your platform (and switch to routing='None')", name);
-      return nullptr;
+    xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
+            "Please remove any link from your platform (and switch to routing='None')",
+            name);
+    return nullptr;
     }
 
     double NetworkConstantModel::nextOccuringEvent(double /*now*/)
@@ -77,7 +75,7 @@ namespace simgrid {
       }
     }
 
-    Action *NetworkConstantModel::communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate)
+    Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
     {
       NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);