X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19e1048a7009c4144b0f361ad85fb9dff44761ea..fbe5afa529e774a03666c764b0f17b4cbf23db43:/src/s4u/s4u_Netzone.cpp diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp index 428c19fef7..a791b038c8 100644 --- a/src/s4u/s4u_Netzone.cpp +++ b/src/s4u/s4u_Netzone.cpp @@ -48,7 +48,7 @@ std::vector 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 +64,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 +95,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 NetZone::convert_to_linkInRoute(const std::vector& link_list) { std::vector links; @@ -116,6 +117,7 @@ void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoin pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical); } +// XBT_ATTRIB_DEPRECATED_v332 void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, const std::vector& link_list, bool symmetrical) @@ -123,6 +125,7 @@ void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoin pimpl_->add_route(src, dst, gw_src, gw_dst, convert_to_linkInRoute(link_list), symmetrical); } +// XBT_ATTRIB_DEPRECATED_v332 void NetZone::add_bypass_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, std::vector& link_list, bool /*symmetrical*/)