Upgrade embedded catch2 (-> v2.13.5).

[simgrid.git] / src / plugins / host_dvfs.cpp

diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp
index 4c203c2..e4f1d01 100644 (file)
--- a/src/plugins/host_dvfs.cpp
+++ b/src/plugins/host_dvfs.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-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. */
@@ -295,11 +295,11 @@ public:
         task_id           = 0;
       }
     });
-    simgrid::s4u::Exec::on_start.connect([this](simgrid::s4u::Actor const&, simgrid::s4u::Exec const& activity) {
+    simgrid::s4u::Exec::on_start.connect([this](simgrid::s4u::Exec const& activity) {
       if (activity.get_host() == get_host())
         pre_task();
     });
-    simgrid::s4u::Exec::on_completion.connect([this](simgrid::s4u::Actor const&, simgrid::s4u::Exec const& activity) {
+    simgrid::s4u::Exec::on_completion.connect([this](simgrid::s4u::Exec const& activity) {
       // For more than one host (not yet supported), we can access the host via
       // simcalls_.front()->issuer->get_iface()->get_host()
       if (activity.get_host() == get_host() && iteration_running) {
@@ -391,25 +391,20 @@ static void on_host_added(simgrid::s4u::Host& host)
     }
 
     auto governor = [&dvfs_governor, &daemon_proc]() -> std::unique_ptr<simgrid::plugin::dvfs::Governor> {
-      if (dvfs_governor == "conservative") {
+      if (dvfs_governor == "conservative")
         return std::make_unique<simgrid::plugin::dvfs::Conservative>(daemon_proc->get_host());
-      } else if (dvfs_governor == "ondemand") {
+      if (dvfs_governor == "ondemand")
         return std::make_unique<simgrid::plugin::dvfs::OnDemand>(daemon_proc->get_host());
-      }
 #if HAVE_SMPI
-      else if (dvfs_governor == "adagio") {
+      if (dvfs_governor == "adagio")
         return std::make_unique<simgrid::plugin::dvfs::Adagio>(daemon_proc->get_host());
-      }
 #endif
-      else if (dvfs_governor == "performance") {
-        return std::make_unique<simgrid::plugin::dvfs::Performance>(daemon_proc->get_host());
-      } else if (dvfs_governor == "powersave") {
+      if (dvfs_governor == "powersave")
         return std::make_unique<simgrid::plugin::dvfs::Powersave>(daemon_proc->get_host());
-      } else {
+      if (dvfs_governor != "performance")
         XBT_CRITICAL("No governor specified for host %s, falling back to Performance",
                      daemon_proc->get_host()->get_cname());
-        return std::make_unique<simgrid::plugin::dvfs::Performance>(daemon_proc->get_host());
-      }
+      return std::make_unique<simgrid::plugin::dvfs::Performance>(daemon_proc->get_host());
     }();
 
     while (true) {