X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4c998d4d5488117b6cf9989e1061238016965fc..737a256dd1d7adf4255c24729ae6069284049d2c:/include/simgrid/kernel/routing/RoutedZone.hpp diff --git a/include/simgrid/kernel/routing/RoutedZone.hpp b/include/simgrid/kernel/routing/RoutedZone.hpp index 6e061e28ad..3fcbd94c6e 100644 --- a/include/simgrid/kernel/routing/RoutedZone.hpp +++ b/include/simgrid/kernel/routing/RoutedZone.hpp @@ -15,7 +15,7 @@ namespace routing { /** @ingroup ROUTING_API * @brief NetZone with an explicit routing (abstract class) * - * This abstract class factorizes code between its subclasses: Full, Dijkstra and Floyd. + * This abstract class factors code between its subclasses: Full, Dijkstra and Floyd. * * * @@ -56,9 +56,9 @@ public: std::map>* edges) override; protected: - RouteCreationArgs* new_extended_route(RoutingMode hierarchy, NetPoint* gw_src, NetPoint* gw_dst, - const std::vector& link_list, bool preserve_order); - XBT_ATTRIB_DEPRECATED_v330("Please drop 2nd, 3rd and 7th parameters") virtual RouteCreationArgs* new_extended_route( + Route* new_extended_route(RoutingMode hierarchy, NetPoint* gw_src, NetPoint* gw_dst, + const std::vector& link_list, bool preserve_order); + XBT_ATTRIB_DEPRECATED_v330("Please drop 2nd, 3rd and 7th parameters") virtual Route* new_extended_route( RoutingMode hierarchy, NetPoint* /* src */, NetPoint* /* dst */, NetPoint* gw_src, NetPoint* gw_dst, std::vector& link_list, bool /* symmetrical */, bool preserve_order) {
Comparison of the RoutedZone subclasses