X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3203159dd4bef99cc4aa8d5917c6909394674a7..8fda202d4864863f54e0a3dd5f22285b0cc9a4ac:/src/kernel/routing/NetPoint.cpp

diff --git a/src/kernel/routing/NetPoint.cpp b/src/kernel/routing/NetPoint.cpp
index d72d8b0728..6326cf27a9 100644
--- a/src/kernel/routing/NetPoint.cpp
+++ b/src/kernel/routing/NetPoint.cpp
@@ -3,8 +3,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/kernel/routing/NetPoint.hpp"
-
+#include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 
@@ -17,13 +16,13 @@ namespace routing {
 simgrid::xbt::signal<void(NetPoint*)> NetPoint::onCreation;
 
 NetPoint::NetPoint(std::string name, NetPoint::Type componentType, NetZoneImpl* netzone_p)
-    : name_(name), componentType_(componentType), netzone_(netzone_p)
+    : name_(name), component_type_(componentType), englobing_zone_(netzone_p)
 {
   if (netzone_p != nullptr)
-    id_ = netzone_p->addComponent(this);
+    id_ = netzone_p->add_component(this);
   else
     id_ = static_cast<decltype(id_)>(-1);
-  simgrid::s4u::Engine::getInstance()->netpointRegister(this);
+  simgrid::s4u::Engine::get_instance()->netpoint_register(this);
   simgrid::kernel::routing::NetPoint::onCreation(this);
 }
 }
@@ -36,5 +35,5 @@ NetPoint::NetPoint(std::string name, NetPoint::Type componentType, NetZoneImpl*
  */
 simgrid::kernel::routing::NetPoint* sg_netpoint_by_name_or_null(const char* name)
 {
-  return simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
+  return simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name);
 }