X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b299a7eeae86643b8ad61ec3273b82d99a392432..2a6c5ce52acb820ea198f6c97cfbe0060219ed4f:/include/simgrid/s4u/NetZone.hpp diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp index 870f85a1fa..d2d706e79f 100644 --- a/include/simgrid/s4u/NetZone.hpp +++ b/include/simgrid/s4u/NetZone.hpp @@ -42,9 +42,9 @@ public: /** @brief Retrieves the name of that netzone as a C string */ const char* get_cname() const; - XBT_ATTRIB_DEPRECATED_v331("Please use get_parent()") NetZone* get_father() const; NetZone* get_parent() const; NetZone* set_parent(const NetZone* parent); + std::vector get_children() const; std::vector get_all_hosts() const; int get_host_count() const; @@ -59,9 +59,11 @@ public: /** @brief Get the netpoint associated to this netzone */ kernel::routing::NetPoint* get_netpoint(); - std::vector get_children() const; +#ifndef DOXYGEN + XBT_ATTRIB_DEPRECATED_v331("Please use get_parent()") NetZone* get_father() const; XBT_ATTRIB_DEPRECATED_v332("Please use set_parent() to manage NetZone's relationship") NetZone* add_child( NetZone* new_zone); +#endif void extract_xbt_graph(const s_xbt_graph_t* graph, std::map>* nodes, std::map>* edges); @@ -267,7 +269,7 @@ XBT_PUBLIC NetZone* create_torus_zone(const std::string& name, const NetZone* pa Link::SharingPolicy sharing_policy); /** @brief Aggregates the parameters necessary to build a Fat-tree zone */ -struct FatTreeParams { +struct XBT_PUBLIC FatTreeParams { unsigned int levels; std::vector down; std::vector up; @@ -307,7 +309,7 @@ XBT_PUBLIC NetZone* create_fatTree_zone(const std::string& name, const NetZone* Link::SharingPolicy sharing_policy); /** @brief Aggregates the parameters necessary to build a Dragonfly zone */ -struct DragonflyParams { +struct XBT_PUBLIC DragonflyParams { std::pair groups; std::pair chassis; std::pair routers;