X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5daf61af49b4b767433387330f7f7d21c63e4e59..9b60e270c5fe98fb6c528164aa9c6e4e6045f7e0:/src/kernel/routing/NetPoint.cpp

diff --git a/src/kernel/routing/NetPoint.cpp b/src/kernel/routing/NetPoint.cpp
index 054b8b4e3b..6a23274eaf 100644
--- a/src/kernel/routing/NetPoint.cpp
+++ b/src/kernel/routing/NetPoint.cpp
@@ -1,10 +1,9 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
 
 /* 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"
 
@@ -14,15 +13,17 @@ namespace simgrid {
 namespace kernel {
 namespace routing {
 
-simgrid::xbt::signal<void(NetPoint*)> NetPoint::onCreation;
+simgrid::xbt::signal<void(NetPoint*)> NetPoint::on_creation;
 
 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);
-  simgrid::s4u::Engine::instance()->netpointRegister(this);
-  simgrid::kernel::routing::NetPoint::onCreation(this);
+    id_ = netzone_p->add_component(this);
+  else
+    id_ = static_cast<decltype(id_)>(-1);
+  simgrid::s4u::Engine::get_instance()->netpoint_register(this);
+  simgrid::kernel::routing::NetPoint::on_creation(this);
 }
 }
 }
@@ -34,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::instance()->netpointByNameOrNull(name);
+  return simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name);
 }