X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19e1048a7009c4144b0f361ad85fb9dff44761ea..6bb41d92e3329c3be26c100026424ed3885d8554:/include/simgrid/kernel/routing/RoutedZone.hpp?ds=sidebyside diff --git a/include/simgrid/kernel/routing/RoutedZone.hpp b/include/simgrid/kernel/routing/RoutedZone.hpp index 08e5c13801..c086cea71f 100644 --- a/include/simgrid/kernel/routing/RoutedZone.hpp +++ b/include/simgrid/kernel/routing/RoutedZone.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2022. 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. */ @@ -57,13 +57,7 @@ public: protected: 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) - { - return new_extended_route(hierarchy, gw_src, gw_dst, link_list, preserve_order); - } + const std::vector& link_list, bool preserve_order); void get_route_check_params(const NetPoint* src, const NetPoint* dst) const; void add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, const std::vector& link_list, bool symmetrical) const; @@ -72,9 +66,4 @@ protected: } // namespace kernel } // namespace simgrid -XBT_PRIVATE xbt_node_t new_xbt_graph_node(const s_xbt_graph_t* graph, const char* name, - std::map>* nodes); -XBT_PRIVATE xbt_edge_t new_xbt_graph_edge(const s_xbt_graph_t* graph, xbt_node_t s, xbt_node_t d, - std::map>* edges); - #endif /* SIMGRID_ROUTING_GENERIC_HPP_ */