Merge branch 'master' into CRTP

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

diff --git a/include/simgrid/kernel/routing/VivaldiZone.hpp b/include/simgrid/kernel/routing/VivaldiZone.hpp
index ca22075150f948a49410c78b56b5c73f40b66df0..38c89db7c103bc976e95691934acf8dab10539c1 100644 (file)
--- a/include/simgrid/kernel/routing/VivaldiZone.hpp
+++ b/include/simgrid/kernel/routing/VivaldiZone.hpp
@@ -46,18 +46,10 @@ namespace routing {
 
 class XBT_PRIVATE VivaldiZone : public ClusterZone {
 public:
-  explicit VivaldiZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel);
+  explicit VivaldiZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel);
 
   void set_peer_link(NetPoint* netpoint, double bw_in, double bw_out, const std::string& coord);
   void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) override;
-
-  // deprecated
-  XBT_ATTRIB_DEPRECATED_v323("Please use VivaldiZone::set_peer_link()") void setPeerLink(NetPoint* netpoint,
-                                                                                         double bw_in, double bw_out,
-                                                                                         std::string coord)
-  {
-    set_peer_link(netpoint, bw_in, bw_out, coord);
-  }
 };
 
 namespace vivaldi {