Merge remote-tracking branch 'upstream/master' into issue95

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

diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp
index bc6203b..b0677f6 100644 (file)
--- a/src/plugins/host_dvfs.cpp
+++ b/src/plugins/host_dvfs.cpp
@@ -295,12 +295,12 @@ public:
         task_id           = 0;
       }
     });
-    simgrid::s4u::Exec::on_start.connect([this](simgrid::s4u::Exec const& activity) {
+    simgrid::s4u::Exec::on_start_cb([this](simgrid::s4u::Exec const& activity) {
       if (activity.get_host() == get_host())
         pre_task();
     });
-    simgrid::s4u::Activity::on_completion.connect([this](simgrid::s4u::Activity& activity) {
-      auto* exec = dynamic_cast<simgrid::s4u::Exec*>(&activity);
+    simgrid::s4u::Activity::on_completion_cb([this](simgrid::s4u::Activity& activity) {
+      const auto* exec = dynamic_cast<simgrid::s4u::Exec*>(&activity);
       if (exec == nullptr) // Only Execs are concerned here
         return;
       // For more than one host (not yet supported), we can access the host via
@@ -444,5 +444,5 @@ void sg_host_dvfs_plugin_init()
 
   sg_host_load_plugin_init();
 
-  simgrid::s4u::Host::on_creation.connect(&on_host_added);
+  simgrid::s4u::Host::on_creation_cb(&on_host_added);
 }