WIP stop using const char* in C++ layers

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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index f349fbd..e2675fc 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -16,13 +16,12 @@ void surf_network_model_init_Constant()
   xbt_assert(surf_network_model == nullptr);
   surf_network_model = new simgrid::surf::NetworkConstantModel();
   all_existing_models->push_back(surf_network_model);
-
-  routing_model_create(nullptr);
 }
 
 namespace simgrid {
   namespace surf {
-  Link* NetworkConstantModel::createLink(const char* name, double bw, double lat, e_surf_link_sharing_policy_t policy)
+  LinkImpl* NetworkConstantModel::createLink(const char* name, double bw, double lat,
+                                             e_surf_link_sharing_policy_t policy)
   {
 
     xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
@@ -79,7 +78,7 @@ namespace simgrid {
     {
       NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
 
-      Link::onCommunicate(action, src, dst);
+      simgrid::s4u::Link::onCommunicate(action, src, dst);
       return action;
     }
 
@@ -92,12 +91,11 @@ namespace simgrid {
     {
       latency_ = latency;
       if (latency_ <= 0.0) {
-        stateSet_ = getModel()->getDoneActionSet();
+        stateSet_ = model_->getDoneActionSet();
         stateSet_->push_back(*this);
       }
     };
 
-    NetworkConstantAction::~NetworkConstantAction() {}
-
+    NetworkConstantAction::~NetworkConstantAction() = default;
   }
 }