cleanups on my disk

[simgrid.git] / include / xbt / functional.hpp

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index 48803e6..40df428 100644 (file)
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -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[])
 {
@@ -305,21 +301,6 @@ XBT_ATTRIB_DEPRECATED_v323("Please use make_task()") auto makeTask(F code, 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