A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
kill deprecated templates that don't compile in C++14
[simgrid.git]
/
include
/
xbt
/
functional.hpp
diff --git
a/include/xbt/functional.hpp
b/include/xbt/functional.hpp
index
48803e6
..
a8a7ad6
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[])
{
@@
-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