further remove boilerplate around std::bind

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index 48803e6..e6f7ca7 100644 (file)
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -56,10 +56,6 @@ template <class F> inline std::function<void()> wrap_main(F code, std::vector<st
 {
   return MainFunction<F>(std::move(code), std::move(args));
 }
-inline std::function<void()> wrap_main(void (*code)(std::vector<std::string>), std::vector<std::string> args)
-{
-  return std::bind(std::move(code), std::move(args));
-}
 
 template <class F> inline std::function<void()> wrap_main(F code, int argc, const char* const argv[])
 {

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index 79045d9..2226ad9 100644 (file)
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -69,7 +69,7 @@ static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code)
 }
 static simgrid::simix::ActorCodeFactory toActorCodeFactory(void (*code)(std::vector<std::string>))
 {
-  return [code](std::vector<std::string> args) { return simgrid::xbt::wrap_main(code, std::move(args)); };
+  return [code](std::vector<std::string> args) { return std::bind(std::move(code), std::move(args)); };
 }
 
 /**