-template<class F> inline
-std::function<void()> wrapMain(F code, 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)