include cleanups in src/s4u

[simgrid.git] / src / s4u / s4u_Netzone.cpp

diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp
index 24279b0..31df149 100644 (file)
--- a/src/s4u/s4u_Netzone.cpp
+++ b/src/s4u/s4u_Netzone.cpp
@@ -4,14 +4,15 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/Exception.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/NetZone.hpp"
-#include "simgrid/simix.hpp"
-#include "simgrid/zone.h"
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/NetZone.hpp>
+#include <simgrid/simix.hpp>
+#include <simgrid/zone.h>
+#include <xbt/parse_units.hpp>
+
 #include "src/surf/network_interface.hpp"
-#include "xbt/parse_units.hpp"
 
 namespace simgrid {
 namespace s4u {
@@ -48,7 +49,7 @@ std::vector<NetZone*> NetZone::get_children() const
   return res;
 }
 
-NetZone* NetZone::add_child(NetZone* new_zone)
+NetZone* NetZone::add_child(NetZone* new_zone) // XBT_ATTRIB_DEPRECATED_v332
 {
   new_zone->set_parent(this);
   return this;
@@ -64,7 +65,7 @@ const char* NetZone::get_cname() const
   return pimpl_->get_cname();
 }
 
-NetZone* NetZone::get_father()
+NetZone* NetZone::get_father() const // XBT_ATTRIB_DEPRECATED_v331
 {
   return pimpl_->get_parent()->get_iface();
 }
@@ -95,11 +96,12 @@ int NetZone::get_host_count() const
   return pimpl_->get_host_count();
 }
 
-int NetZone::add_component(kernel::routing::NetPoint* elm)
+unsigned long NetZone::add_component(kernel::routing::NetPoint* elm)
 {
   return pimpl_->add_component(elm);
 }
 
+// XBT_ATTRIB_DEPRECATED_v332
 std::vector<LinkInRoute> NetZone::convert_to_linkInRoute(const std::vector<kernel::resource::LinkImpl*>& link_list)
 {
   std::vector<LinkInRoute> links;