Simplify NetZone's hierarchy

[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 ecbe7187cc883970899bc1f1d4e06867bfa4ddbe..d7627b96c5aaa9d9f213a1392855a268d568bcd1 100644 (file)
--- a/include/simgrid/kernel/routing/VivaldiZone.hpp
+++ b/include/simgrid/kernel/routing/VivaldiZone.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. */
@@ -46,26 +46,16 @@ namespace routing {
 
 class XBT_PRIVATE VivaldiZone : public ClusterZone {
 public:
-  explicit VivaldiZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel);
-
-  void set_peer_link(NetPoint* netpoint, double bw_in, double bw_out, std::string coord);
+  using ClusterZone::ClusterZone;
+  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 {
 class XBT_PRIVATE Coords {
 public:
-  static simgrid::xbt::Extension<NetPoint, Coords> EXTENSION_ID;
-  explicit Coords(NetPoint* host, std::string str);
-  virtual ~Coords() = default;
+  static xbt::Extension<NetPoint, Coords> EXTENSION_ID;
+  explicit Coords(NetPoint* host, const std::string& str);
 
   std::vector<double> coords;
 };