use std::function instead of pointers to functions to please sonar

diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp
index 39aa01f..b1405ca 100644 (file)
--- a/include/simgrid/s4u/Engine.hpp
+++ b/include/simgrid/s4u/Engine.hpp
@@ -53,29 +53,31 @@ public:
   XBT_ATTRIB_DEPRECATED_v330("Please change the return code of your actors to void") void register_function(
       const std::string& name, int (*code)(int, char**));
 
-  void register_function(const std::string& name, void (*code)(int, char**));
-  void register_function(const std::string& name, void (*code)(std::vector<std::string>));
+  void register_function(const std::string& name, std::function<void(int, char**)> code);
+  void register_function(const std::string& name, std::function<void(std::vector<std::string>)> code);
 
   XBT_ATTRIB_DEPRECATED_v330("Please change the return code of your actors to void") void register_default(
       int (*code)(int, char**));
-  void register_default(void (*code)(int, char**));
+  void register_default(std::function<void(int, char**)> code);
   void register_default(const kernel::actor::ActorCodeFactory& factory);
 
   void register_function(const std::string& name, const kernel::actor::ActorCodeFactory& factory);
   template <class F> void register_actor(const std::string& name)
   {
-    register_function(name, [](std::vector<std::string> args) {
+    kernel::actor::ActorCodeFactory code_factory = [](std::vector<std::string> args) {
       return kernel::actor::ActorCode([args] {
         F code(std::move(args));
         code();
       });
-    });
+    };
+    register_function(name, std::move(code_factory));
   }
   template <class F> void register_actor(const std::string& name, F code)
   {
-    register_function(name, [code](std::vector<std::string> args) {
+    kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
       return kernel::actor::ActorCode([code, args] { code(std::move(args)); });
-    });
+    };
+    register_function(name, std::move(code_factory));
   }
 
   void load_deployment(const std::string& deploy);

diff --git a/src/msg/msg_legacy.cpp b/src/msg/msg_legacy.cpp
index 505ea3b..f39efe1 100644 (file)
--- a/src/msg/msg_legacy.cpp
+++ b/src/msg/msg_legacy.cpp
@@ -27,8 +27,10 @@ msg_error_t MSG_main()
 }
 void MSG_function_register(const char* name, int (*code)(int, char**))
 {
-  simgrid::s4u::Engine::get_instance()->register_function(
-      name, [code](std::vector<std::string> args) { return simgrid::xbt::wrap_main(code, std::move(args)); });
+  simgrid::kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
+    return simgrid::xbt::wrap_main(code, std::move(args));
+  };
+  simgrid::s4u::Engine::get_instance()->register_function(name, code_factory);
 }
 void MSG_function_register_default(int (*code)(int, char**))
 {

diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp
index c4ecd81..2c486a0 100644 (file)
--- a/src/s4u/s4u_Engine.cpp
+++ b/src/s4u/s4u_Engine.cpp
@@ -93,7 +93,10 @@ void Engine::load_platform(const std::string& platf)
 
 void Engine::register_function(const std::string& name, int (*code)(int, char**)) // deprecated
 {
-  register_function(name, [code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
+  kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
+    return xbt::wrap_main(code, std::move(args));
+  };
+  register_function(name, std::move(code_factory));
 }
 void Engine::register_default(int (*code)(int, char**)) // deprecated
 {
@@ -101,23 +104,28 @@ void Engine::register_default(int (*code)(int, char**)) // deprecated
 }
 
 /** Registers the main function of an actor that will be launched from the deployment file */
-void Engine::register_function(const std::string& name, void (*code)(int, char**))
+void Engine::register_function(const std::string& name, std::function<void(int, char**)> code)
 {
-  register_function(name, [code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
+  kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
+    return xbt::wrap_main(code, std::move(args));
+  };
+  register_function(name, std::move(code_factory));
 }
 
 /** Registers the main function of an actor that will be launched from the deployment file */
-void Engine::register_function(const std::string& name, void (*code)(std::vector<std::string>))
+void Engine::register_function(const std::string& name, std::function<void(std::vector<std::string>)> code)
 {
-  register_function(name,
-                    [code](std::vector<std::string> args) { return std::bind(std::move(code), std::move(args)); });
+  kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
+    return std::bind(std::move(code), std::move(args));
+  };
+  register_function(name, std::move(code_factory));
 }
 /** Registers a function as the default main function of actors
  *
  * It will be used as fallback when the function requested from the deployment file was not registered.
  * It is used for trace-based simulations (see examples/s4u/replay-comms and similar).
  */
-void Engine::register_default(void (*code)(int, char**))
+void Engine::register_default(std::function<void(int, char**)> code)
 {
   register_default([code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
 }