Skip to content
Snippets Groups Projects
Commit 4d903de2 authored by graeser's avatar graeser
Browse files

Merge branch 'replace-result-of-t' into 'master'

Replace std::result_of_t by std::invoke_result_t

See merge request !81
parents 7c839d70 07f40bbc
No related branches found
No related tags found
1 merge request!81Replace std::result_of_t by std::invoke_result_t
Pipeline #65444 passed
...@@ -52,7 +52,7 @@ namespace Dune { ...@@ -52,7 +52,7 @@ namespace Dune {
* of the header string coincide to get a readable log. * of the header string coincide to get a readable log.
*/ */
template<class F, template<class F,
std::enable_if_t<std::is_convertible<std::result_of_t<F()>, Result>::value, int> = 0> std::enable_if_t<std::is_convertible<std::invoke_result_t<F>, Result>::value, int> = 0>
Criterion(F&& f, const std::string& header) : Criterion(F&& f, const std::string& header) :
f_(std::forward<F>(f)), f_(std::forward<F>(f)),
header_(header) header_(header)
...@@ -76,7 +76,7 @@ namespace Dune { ...@@ -76,7 +76,7 @@ namespace Dune {
* of the header string coincide to get a readable log. * of the header string coincide to get a readable log.
*/ */
template<class F, template<class F,
std::enable_if_t<std::is_convertible<std::result_of_t<F()>, std::string>::value, int> = 0> std::enable_if_t<std::is_convertible<std::invoke_result_t<F>, std::string>::value, int> = 0>
Criterion(F&& f, const std::string& header) : Criterion(F&& f, const std::string& header) :
f_( [=]() mutable {return std::make_tuple(false, f());} ), f_( [=]() mutable {return std::make_tuple(false, f());} ),
header_(header) header_(header)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment