Merge branch 'cleanup/use-c++17-is-invokable' into 'master'

Cleanup/use c++17 is invokable

See merge request !1917

dumux/common/doubleexpintegrator.hh

@@ -54,8 +54,8 @@
 
 #include <cmath>
 #include <limits>
+#include <type_traits>
 
-#include <dune/common/std/type_traits.hh>
 #include <dumux/common/doubleexpintegrationconstants.hh>
 
 namespace Dumux {
@@ -78,7 +78,7 @@ public:
      * \return The value of the integral
      */
     template<class Function,
-             typename std::enable_if_t<Dune::Std::is_invocable<Function, Scalar>::value>...>
+             typename std::enable_if_t<std::is_invocable_r_v<Scalar, Function, Scalar>>...>
     static Scalar integrate(const Function& f,
                             const Scalar a,
                             const Scalar b,
@@ -107,7 +107,7 @@ public:
      * \return The value of the integral.
      */
     template<class Function,
-             typename std::enable_if_t<Dune::Std::is_invocable<Function, Scalar>::value>...>
+             typename std::enable_if_t<std::is_invocable_r_v<Scalar, Function, Scalar>>...>
     static Scalar integrate(const Function& f,
                             const Scalar a,
                             const Scalar b,

dumux/common/integrate.hh

@@ -29,7 +29,6 @@
 
 #include <dune/geometry/quadraturerules.hh>
 #include <dune/common/concept.hh>
-#include <dune/common/std/type_traits.hh>
 
 #if HAVE_DUNE_FUNCTIONS
 #include <dune/functions/gridfunctions/gridfunction.hh>
@@ -262,7 +261,7 @@ auto integrateL2Error(const GridView& gv,
  * \return The value of the integral
  */
 template<class Scalar, class Function,
-          typename std::enable_if_t<Dune::Std::is_invocable<Function, Scalar>::value>...>
+          typename std::enable_if_t<std::is_invocable_r_v<Scalar, Function, Scalar>>...>
 Scalar integrateScalarFunction(const Function& f,
                                const Scalar lowerBound,
                                const Scalar upperBound,

dumux/nonlinear/findscalarroot.hh

@@ -26,8 +26,7 @@
 
 #include <cmath>
 #include <limits>
-
-#include <dune/common/std/type_traits.hh>
+#include <type_traits>
 
 #include <dumux/common/exceptions.hh>
 #include <dumux/common/parameters.hh>
@@ -43,11 +42,10 @@ namespace Dumux {
  * \param derivative Derivative of the residual
  * \param tol Relative shift tolerance
  * \param maxIter Maximum number of iterations
- * \todo replace std::result_of by std::invoke_result for C++17
  */
 template<class Scalar, class ResFunc, class DerivFunc,
-         typename std::enable_if_t<Dune::Std::is_invocable<ResFunc, Scalar>::value &&
-                                   Dune::Std::is_invocable<DerivFunc, Scalar>::value>...>
+         typename std::enable_if_t<std::is_invocable_r_v<Scalar, ResFunc, Scalar> &&
+                                   std::is_invocable_r_v<Scalar, DerivFunc, Scalar>>...>
 Scalar findScalarRootNewton(Scalar xOld, const ResFunc& residual, const DerivFunc& derivative,
                             const Scalar tol = 1e-13, const int maxIter = 200)
 {
@@ -87,7 +85,7 @@ Scalar findScalarRootNewton(Scalar xOld, const ResFunc& residual, const DerivFun
  * \param maxIter Maximum number of iterations
  */
 template<class Scalar, class ResFunc,
-          typename std::enable_if_t<Dune::Std::is_invocable<ResFunc, Scalar>::value>...>
+          typename std::enable_if_t<std::is_invocable_r_v<Scalar, ResFunc, Scalar>>...>
 Scalar findScalarRootNewton(Scalar xOld, const ResFunc& residual,
                             const Scalar tol = 1e-13, const int maxIter = 200)
 {
@@ -109,7 +107,7 @@ Scalar findScalarRootNewton(Scalar xOld, const ResFunc& residual,
  * \param maxIter Maximum number of iterations
  */
 template<class Scalar, class ResFunc,
-         typename std::enable_if_t<Dune::Std::is_invocable<ResFunc, Scalar>::value>...>
+         typename std::enable_if_t<std::is_invocable_r_v<Scalar, ResFunc, Scalar>>...>
 Scalar findScalarRootBrent(Scalar a, Scalar b, const ResFunc& residual,
                            const Scalar tol = 1e-13, const int maxIter = 200)
 {