Update copyright lines.

[simgrid.git] / include / simgrid / kernel / routing / RoutedZone.hpp

diff --git a/include/simgrid/kernel/routing/RoutedZone.hpp b/include/simgrid/kernel/routing/RoutedZone.hpp
index efe3729..f3c6698 100644 (file)
--- 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-2021. 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,29 +50,31 @@ namespace routing {
 
 class XBT_PRIVATE RoutedZone : public NetZoneImpl {
 public:
-  explicit RoutedZone(NetZone* father, std::string name);
+  explicit RoutedZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel);
 
-  void getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
-                std::map<std::string, xbt_edge_t>* edges) override;
-  virtual RouteCreationArgs* newExtendedRoute(RoutingMode hierarchy, NetPoint* src, NetPoint* dst, NetPoint* gw_src,
-                                              NetPoint* gw_dst, std::vector<simgrid::surf::LinkImpl*>& link_list,
-                                              bool symmetrical, bool change_order);
+  void get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t, std::less<>>* nodes,
+                 std::map<std::string, xbt_edge_t, std::less<>>* edges) override;
 
 protected:
-  void getRouteCheckParams(NetPoint* src, NetPoint* dst);
-  void addRouteCheckParams(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
-                           kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
-                           std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical);
+  RouteCreationArgs* new_extended_route(RoutingMode hierarchy, NetPoint* gw_src, NetPoint* gw_dst,
+                                        const std::vector<resource::LinkImpl*>& link_list, bool preserve_order);
+  XBT_ATTRIB_DEPRECATED_v330("Please drop 2nd, 3rd and 7th parameters") virtual RouteCreationArgs* new_extended_route(
+      RoutingMode hierarchy, NetPoint* /* src */, NetPoint* /* dst */, NetPoint* gw_src, NetPoint* gw_dst,
+      std::vector<resource::LinkImpl*>& link_list, bool /* symmetrical */, bool preserve_order)
+  {
+    return new_extended_route(hierarchy, gw_src, gw_dst, link_list, preserve_order);
+  }
+  void get_route_check_params(NetPoint* src, NetPoint* dst) const;
+  void add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+                              const std::vector<resource::LinkImpl*>& link_list, bool symmetrical) const;
 };
 } // namespace routing
 } // namespace kernel
 } // namespace simgrid
 
-extern "C" {
-XBT_PRIVATE xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name,
-                                          std::map<std::string, xbt_node_t>* nodes);
-XBT_PRIVATE xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d,
-                                          std::map<std::string, xbt_edge_t>* edges);
-}
+XBT_PRIVATE xbt_node_t new_xbt_graph_node(const s_xbt_graph_t* graph, const char* name,
+                                          std::map<std::string, xbt_node_t, std::less<>>* 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<std::string, xbt_edge_t, std::less<>>* edges);
 
 #endif /* SIMGRID_ROUTING_GENERIC_HPP_ */