From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Thu, 27 Dec 2018 18:10:55 +0000 (+0100)
Subject: kill deprecated templates that don't compile in C++14
X-Git-Tag: v3_22~748
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1643b1711d3403b8c3ae7091e38cb69f5f9a1272

kill deprecated templates that don't compile in C++14
---

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index e6f7ca7b08..a8a7ad6e07 100644
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -301,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
diff --git a/include/xbt/future.hpp b/include/xbt/future.hpp
index 521b02ba94..1bcf58209b 100644
--- a/include/xbt/future.hpp
+++ b/include/xbt/future.hpp
@@ -259,11 +259,6 @@ template <class P, class F> inline void set_promise(P& promise, F&& future)
 {
   fulfill_promise(promise, [&] { return std::forward<F>(future).get(); });
 }
-template <class P, class F>
-inline XBT_ATTRIB_DEPRECATED_v323("Please use xbt::set_promise()") void setPromise(P& promise, F&& future)
-{
-  fulfill_promise(promise, [&] { return std::forward<F>(future).get(); });
-}
 
 }
 }