From: Loic Guegan <manzerberdes@gmx.com>
Date: Thu, 4 Jul 2019 15:21:51 +0000 (+0200)
Subject: Merge branch 'master' of framagit.org:simgrid/simgrid
X-Git-Tag: v3.23.2~14
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9f7e9a5afbeed8d2a18f3f52390da42856366eb7?hp=40ec51314bd79bc97ee416073e9805088eab6f7c

Merge branch 'master' of framagit.org:simgrid/simgrid
---

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 7a47fa4c00..883578bf6b 100644
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -267,16 +267,6 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam
   simgrid::s4u::Link::on_creation(this->piface_);
 }
 
-NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
-                                 s4u::Link::SharingPolicy policy, lmm::System* system)
-    : NetworkCm02Link(model, name, 0, 0, policy, system)
-{
-  /* Setup Metrics for bandwidths_ */
-  for (auto bandwidth : bandwidths) {
-    bandwidths_.push_back({bandwidth, 1.0, nullptr});
-  }
-}
-
 void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double value)
 {
   /* Find out which of my iterators was triggered, and react accordingly */
diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 8cfa9ff60c..cd576d6e94 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -47,8 +47,6 @@ class NetworkCm02Link : public LinkImpl {
 public:
   NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency,
                   s4u::Link::SharingPolicy policy, lmm::System* system);
-  NetworkCm02Link(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
-                  s4u::Link::SharingPolicy policy, lmm::System* system);
   virtual ~NetworkCm02Link() = default;
   void apply_event(kernel::profile::Event* event, double value) override;
   void set_bandwidth(double value) override;
diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index e0cb0807ed..79103fdc16 100644
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -160,8 +160,6 @@ public:
   Metric latency_                   = {1.0, 0, nullptr};
   Metric bandwidth_                 = {1.0, 0, nullptr};
 
-  /** @brief A link can have several bandwith attach to it (mostly use by wifi model) */
-  std::vector<Metric> bandwidths_;
 };
 
 /**********