X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/95a02a8febe84fd1c2ed98c78c594a5e8a0116f7..8b853cf697928f829717bb60bd9c1cadaf2beb8e:/include/simgrid/kernel/routing/NetPoint.hpp

diff --git a/include/simgrid/kernel/routing/NetPoint.hpp b/include/simgrid/kernel/routing/NetPoint.hpp
index 88108241b5..0b239f7a87 100644
--- a/include/simgrid/kernel/routing/NetPoint.hpp
+++ b/include/simgrid/kernel/routing/NetPoint.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2019. 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. */
@@ -10,7 +10,7 @@
 #include <xbt/base.h>
 #include <xbt/signal.hpp>
 
-#include <src/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
 
 namespace simgrid {
 namespace kernel {
@@ -26,34 +26,34 @@ class NetPoint : public simgrid::xbt::Extendable<NetPoint> {
 public:
   enum class Type { Host, Router, NetZone };
 
-  NetPoint(std::string name, NetPoint::Type componentType, NetZoneImpl* netzone_p);
+  NetPoint(const std::string& name, NetPoint::Type component_type, NetZoneImpl* netzone_p);
   ~NetPoint() = default;
 
   // Our rank in the vertices_ array of the netzone that contains us.
   unsigned int id() { return id_; }
-  const std::string& getName() const { return name_; }
-  const char* getCname() const { return name_.c_str(); }
+  const std::string& get_name() const { return name_; }
+  const char* get_cname() const { return name_.c_str(); }
   /** @brief the NetZone in which this NetPoint is included */
-  NetZoneImpl* netzone() { return netzone_; }
+  NetZoneImpl* get_englobing_zone() { return englobing_zone_; }
 
-  bool isNetZone() { return componentType_ == Type::NetZone; }
-  bool isHost() { return componentType_ == Type::Host; }
-  bool isRouter() { return componentType_ == Type::Router; }
+  bool is_netzone() const { return component_type_ == Type::NetZone; }
+  bool is_host() const { return component_type_ == Type::Host; }
+  bool is_router() const { return component_type_ == Type::Router; }
 
-  static simgrid::xbt::signal<void(NetPoint*)> onCreation;
+  static simgrid::xbt::signal<void(NetPoint&)> on_creation;
 
   bool operator<(const NetPoint& rhs) const { return name_ < rhs.name_; }
 
 private:
   unsigned int id_;
   std::string name_;
-  NetPoint::Type componentType_;
-  NetZoneImpl* netzone_;
+  NetPoint::Type component_type_;
+  NetZoneImpl* englobing_zone_;
 };
 } // namespace routing
 } // namespace kernel
 } // namespace simgrid
 
-XBT_PUBLIC sg_netpoint_t sg_netpoint_by_name_or_null(const char* name);
+XBT_PUBLIC simgrid::kernel::routing::NetPoint* sg_netpoint_by_name_or_null(const char* name);
 
 #endif /* KERNEL_ROUTING_NETPOINT_HPP_ */