From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 14 Aug 2018 23:58:58 +0000 (+0200)
Subject: do not reimplement (poorly) std::bind
X-Git-Tag: v3_21~249
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/da782b62777961ea5041717ec5ae80248d6d5785

do not reimplement (poorly) std::bind

(and move deprecated symbols by the end of this file)
---

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index a0c4f26500..48803e619e 100644
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -51,29 +51,6 @@ public:
       code_(argc, nullptr);
   }
 };
-class MainStdFunction {
-private:
-  void (*code_)(std::vector<std::string>);
-  std::shared_ptr<const std::vector<std::string>> args_;
-
-public:
-  MainStdFunction(void (*code)(std::vector<std::string>), std::vector<std::string> args)
-      : code_(std::move(code)), args_(std::make_shared<const std::vector<std::string>>(std::move(args)))
-  {
-  }
-  void operator()() const
-  {
-    std::vector<std::string> args = *args_;
-    code_(args);
-  }
-};
-
-template <class F>
-inline XBT_ATTRIB_DEPRECATED_v323("Please use wrap_main()") std::function<void()> wrapMain(
-    F code, std::vector<std::string> args)
-{
-  return MainFunction<F>(std::move(code), std::move(args));
-}
 
 template <class F> inline std::function<void()> wrap_main(F code, std::vector<std::string> args)
 {
@@ -81,16 +58,9 @@ template <class F> inline std::function<void()> wrap_main(F code, std::vector<st
 }
 inline std::function<void()> wrap_main(void (*code)(std::vector<std::string>), std::vector<std::string> args)
 {
-  return MainStdFunction(std::move(code), std::move(args));
+  return std::bind(std::move(code), std::move(args));
 }
 
-template <class F>
-inline XBT_ATTRIB_DEPRECATED_v323("Please use wrap_main()") std::function<void()> wrapMain(F code, int argc,
-                                                                                           const char* const argv[])
-{
-  std::vector<std::string> args(argv, argv + argc);
-  return MainFunction<F>(std::move(code), std::move(args));
-}
 template <class F> inline std::function<void()> wrap_main(F code, int argc, const char* const argv[])
 {
   std::vector<std::string> args(argv, argv + argc);
@@ -320,20 +290,36 @@ public:
   }
 };
 
-template <class F, class... Args>
-XBT_ATTRIB_DEPRECATED_v323("Please use make_task()") auto makeTask(F code, Args... args)
-    -> Task<decltype(code(std::move(args)...))()>
+template <class F, class... Args> auto make_task(F code, Args... args) -> Task<decltype(code(std::move(args)...))()>
 {
   TaskImpl<F, Args...> task(std::move(code), std::make_tuple(std::move(args)...));
   return Task<decltype(code(std::move(args)...))()>(std::move(task));
 }
 
-template <class F, class... Args> auto make_task(F code, Args... args) -> Task<decltype(code(std::move(args)...))()>
+// Deprecated
+template <class F, class... Args>
+XBT_ATTRIB_DEPRECATED_v323("Please use make_task()") auto makeTask(F code, Args... args)
+    -> Task<decltype(code(std::move(args)...))()>
 {
   TaskImpl<F, Args...> task(std::move(code), std::make_tuple(std::move(args)...));
   return Task<decltype(code(std::move(args)...))()>(std::move(task));
 }
+
+template <class F>
+inline XBT_ATTRIB_DEPRECATED_v323("Please use wrap_main()") std::function<void()> wrapMain(
+    F code, std::vector<std::string> args)
+{
+  return MainFunction<F>(std::move(code), std::move(args));
 }
+
+template <class F>
+inline XBT_ATTRIB_DEPRECATED_v323("Please use wrap_main()") std::function<void()> wrapMain(F code, int argc,
+                                                                                           const char* const argv[])
+{
+  std::vector<std::string> args(argv, argv + argc);
+  return MainFunction<F>(std::move(code), std::move(args));
 }
 
+} // namespace xbt
+} // namespace simgrid
 #endif