X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc8be6494932e66a359ae5d47103a566cc8234f4..65beede857f93e33c96e544f76b93793c973dc10:/include/simgrid/kernel/routing/RoutedZone.hpp diff --git a/include/simgrid/kernel/routing/RoutedZone.hpp b/include/simgrid/kernel/routing/RoutedZone.hpp index 46c6518e37..55995aafc6 100644 --- a/include/simgrid/kernel/routing/RoutedZone.hpp +++ b/include/simgrid/kernel/routing/RoutedZone.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2019. 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. */ @@ -50,7 +50,7 @@ namespace routing { class XBT_PRIVATE RoutedZone : public NetZoneImpl { public: - explicit RoutedZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel); + explicit RoutedZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel); void get_graph(xbt_graph_t graph, std::map* nodes, std::map* edges) override; @@ -62,25 +62,6 @@ protected: void get_route_check_params(NetPoint* src, NetPoint* dst); void add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, std::vector& link_list, bool symmetrical); - - // deprecated - XBT_ATTRIB_DEPRECATED_v323("Please use RoutedZone::new_extended_route()") virtual RouteCreationArgs* newExtendedRoute( - RoutingMode hierarchy, NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, - std::vector& link_list, bool symmetrical, bool change_order) - { - return new_extended_route(hierarchy, src, dst, gw_src, gw_dst, link_list, symmetrical, change_order); - } - XBT_ATTRIB_DEPRECATED_v323("Please use RoutedZone::get_route_check_params()") void getRouteCheckParams(NetPoint* src, - NetPoint* dst) - { - get_route_check_params(src, dst); - } - XBT_ATTRIB_DEPRECATED_v323("Please use RoutedZone::add_route_check_params()") void addRouteCheckParams( - NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, std::vector& link_list, - bool symmetrical) - { - add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical); - } }; } // namespace routing } // namespace kernel