From 43a903136c9d0de80ff363e0d49b0c91df5ed719 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Sat, 21 Nov 2020 15:51:29 +0100
Subject: [PATCH] Kill two unused helper functions.

---
 src/kernel/lmm/fair_bottleneck.cpp | 5 -----
 src/kernel/lmm/maxmin.cpp          | 5 -----
 src/kernel/lmm/maxmin.hpp          | 3 ---
 src/surf/network_cm02.cpp          | 4 ++--
 src/surf/network_cm02.hpp          | 2 +-
 5 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/kernel/lmm/fair_bottleneck.cpp b/src/kernel/lmm/fair_bottleneck.cpp
index a95a0110e8..4f65523921 100644
--- a/src/kernel/lmm/fair_bottleneck.cpp
+++ b/src/kernel/lmm/fair_bottleneck.cpp
@@ -15,11 +15,6 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_maxmin);
 
-simgrid::kernel::lmm::System* simgrid::kernel::lmm::make_new_fair_bottleneck_system(bool selective_update)
-{
-  return new simgrid::kernel::lmm::FairBottleneck(selective_update);
-}
-
 void simgrid::kernel::lmm::FairBottleneck::bottleneck_solve()
 {
   if (not modified_)
diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp
index b78013167b..052a3108ba 100644
--- a/src/kernel/lmm/maxmin.cpp
+++ b/src/kernel/lmm/maxmin.cpp
@@ -21,11 +21,6 @@ using dyn_light_t = std::vector<int>;
 int Variable::next_rank_   = 1;
 int Constraint::next_rank_ = 1;
 
-System* make_new_maxmin_system(bool selective_update)
-{
-  return new System(selective_update);
-}
-
 int Element::get_concurrency() const
 {
   // Ignore element with weight less than one (e.g. cross-traffic)
diff --git a/src/kernel/lmm/maxmin.hpp b/src/kernel/lmm/maxmin.hpp
index 5fd382799d..264b1b50a5 100644
--- a/src/kernel/lmm/maxmin.hpp
+++ b/src/kernel/lmm/maxmin.hpp
@@ -560,9 +560,6 @@ private:
   void bottleneck_solve();
 };
 
-XBT_PUBLIC System* make_new_maxmin_system(bool selective_update);
-XBT_PUBLIC System* make_new_fair_bottleneck_system(bool selective_update);
-
 /** @} */
 } // namespace lmm
 } // namespace kernel
diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 0f4c844add..cffaa2ebd6 100644
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -71,7 +71,7 @@ namespace simgrid {
 namespace kernel {
 namespace resource {
 
-NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool))
+NetworkCm02Model::NetworkCm02Model()
     : NetworkModel(simgrid::config::get_value<std::string>("network/optim") == "Full" ? Model::UpdateAlgo::FULL
                                                                                       : Model::UpdateAlgo::LAZY)
 {
@@ -86,7 +86,7 @@ NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(b
     select = true;
   }
 
-  set_maxmin_system(make_new_lmm_system(select));
+  set_maxmin_system(new lmm::System(select));
   loopback_ = NetworkCm02Model::create_link("__loopback__", 
                                             std::vector<double>{simgrid::config::get_value<double>("network/loopback-bw")},
                                             simgrid::config::get_value<double>("network/loopback-lat"),
diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index e5b1e638f7..9ee5115343 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -30,7 +30,7 @@ class XBT_PRIVATE NetworkSmpiModel;
 
 class NetworkCm02Model : public NetworkModel {
 public:
-  explicit NetworkCm02Model(lmm::System* (*make_new_sys)(bool) = &lmm::make_new_maxmin_system);
+  NetworkCm02Model();
   ~NetworkCm02Model() override = default;
   LinkImpl* create_link(const std::string& name, const std::vector<double>& bandwidths, double latency,
                         s4u::Link::SharingPolicy policy) override;
-- 
2.20.1