From fcef8d1604e32ba4f7656b4a74afbb2ef454dcfb Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Sun, 14 May 2017 13:09:31 +0200 Subject: [PATCH] Use Dune::IsNumber Dune::IsNumber - uses std::is_arithmetic which is exactly what we need here - already covers std::complex and GMPField (through gmpfield.hh) --- dune/matrix-vector/scalartraits.hh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dune/matrix-vector/scalartraits.hh b/dune/matrix-vector/scalartraits.hh index 5fabfc1..0894730 100644 --- a/dune/matrix-vector/scalartraits.hh +++ b/dune/matrix-vector/scalartraits.hh @@ -3,6 +3,7 @@ #include <dune/common/diagonalmatrix.hh> #include <dune/common/fmatrix.hh> +#include <dune/common/typetraits.hh> #include <dune/istl/bcrsmatrix.hh> #include <dune/istl/scaledidmatrix.hh> @@ -16,7 +17,7 @@ namespace MatrixVector { template <class T> struct ScalarTraits { enum { - isScalar = (std::is_scalar<T>::value and not std::is_pointer<T>::value) + isScalar = Dune::IsNumber<T>::value }; }; -- GitLab