Merge branch 'actor-yield' of github.com:Takishipp/simgrid into actor-yield

[simgrid.git] / src / kernel / routing / NetPoint.hpp

diff --git a/src/kernel/routing/NetPoint.hpp b/src/kernel/routing/NetPoint.hpp
index b077a37..0a48274 100644 (file)
--- a/src/kernel/routing/NetPoint.hpp
+++ b/src/kernel/routing/NetPoint.hpp
@@ -1,20 +1,17 @@
-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2017. 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. */
 
-#ifndef KERNEL_ROUTING_NETCARD_HPP_
-#define KERNEL_ROUTING_NETCARD_HPP_
+#ifndef KERNEL_ROUTING_NETPOINT_HPP_
+#define KERNEL_ROUTING_NETPOINT_HPP_
 
 #include <xbt/Extendable.hpp>
 #include <xbt/base.h>
 #include <xbt/signal.hpp>
 
 #include "src/kernel/routing/NetZoneImpl.hpp"
-/*
-#include <float.h>
-#include <vector>
-*/
+
 namespace simgrid {
 namespace kernel {
 namespace routing {
@@ -34,9 +31,9 @@ public:
 
   // Our rank in the vertices_ array of the netzone that contains us.
   unsigned int id() { return id_; }
-  std::string name() { return name_; }
-  const char* cname() { return name_.c_str(); }
-  /** @brief the NetZone in which this netcard is included */
+  const std::string& getName() const { return name_; }
+  const char* getCname() const { return name_.c_str(); }
+  /** @brief the NetZone in which this NetPoint is included */
   NetZoneImpl* netzone() { return netzone_; }
 
   bool isNetZone() { return componentType_ == Type::NetZone; }
@@ -57,6 +54,6 @@ private:
 }
 }
 
-XBT_PUBLIC(sg_netcard_t) sg_netcard_by_name_or_null(const char* name);
+XBT_PUBLIC(sg_netpoint_t) sg_netpoint_by_name_or_null(const char* name);
 
-#endif /* KERNEL_ROUTING_NETCARD_HPP_ */
+#endif /* KERNEL_ROUTING_NETPOINT_HPP_ */