From: Wolfgang Bangerth Date: Mon, 24 Jan 2022 18:34:45 +0000 (-0700) Subject: Minor edits to type traits classes. X-Git-Tag: v9.4.0-rc1~569^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb860f3464abbe116cbb8267cef31d873bf4dba0;p=dealii.git Minor edits to type traits classes. --- diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h index 09794599bf..44d0161fbf 100644 --- a/include/deal.II/lac/la_parallel_vector.h +++ b/include/deal.II/lac/la_parallel_vector.h @@ -1899,7 +1899,7 @@ namespace internal public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; // A helper type-trait that leverage SFINAE to figure out if type T has @@ -1917,7 +1917,7 @@ namespace internal public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; // A helper type-trait that leverage SFINAE to figure out if type T has @@ -1935,7 +1935,7 @@ namespace internal public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; // A helper type-trait that leverage SFINAE to figure out if type T has @@ -1954,7 +1954,7 @@ namespace internal public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; // Used for (Trilinos/PETSc)Wrappers::SparseMatrix diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h index 7e292ccf91..ef2383fecd 100644 --- a/include/deal.II/lac/precondition.h +++ b/include/deal.II/lac/precondition.h @@ -536,13 +536,13 @@ namespace internal template static decltype( - std::declval().Tvmult(std::declval(), + std::declval().Tvmult(std::declval(), std::declval())) detect(const U &); public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; template @@ -557,13 +557,13 @@ namespace internal template static decltype( - std::declval().step(std::declval(), + std::declval().step(std::declval(), std::declval())) detect(const U &); public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; template @@ -578,14 +578,14 @@ namespace internal template static decltype( - std::declval().step(std::declval(), + std::declval().step(std::declval(), std::declval(), std::declval())) detect(const U &); public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; template @@ -600,13 +600,13 @@ namespace internal template static decltype( - std::declval().Tstep(std::declval(), + std::declval().Tstep(std::declval(), std::declval())) detect(const U &); public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; template @@ -621,14 +621,14 @@ namespace internal template static decltype( - std::declval().Tstep(std::declval(), + std::declval().Tstep(std::declval(), std::declval(), std::declval())) detect(const U &); public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; template @@ -643,14 +643,14 @@ namespace internal template static decltype( - std::declval().Jacobi_step(std::declval(), + std::declval().Jacobi_step(std::declval(), std::declval(), 1.0)) detect(const U &); public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; template @@ -665,14 +665,14 @@ namespace internal template static decltype( - std::declval().SOR_step(std::declval(), + std::declval().SOR_step(std::declval(), std::declval(), 1.0)) detect(const U &); public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; template @@ -687,14 +687,14 @@ namespace internal template static decltype( - std::declval().SSOR_step(std::declval(), + std::declval().SSOR_step(std::declval(), std::declval(), 1.0)) detect(const U &); public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; template @@ -2632,8 +2632,8 @@ namespace internal // detector, otherwise SFINAE let's it work with the more general first // one that is bool static const bool value = - !std::is_same()))>::value && + !std::is_same())), + bool>::value && std::is_same>::value && std::is_same< VectorType, diff --git a/include/deal.II/matrix_free/type_traits.h b/include/deal.II/matrix_free/type_traits.h index d2b6170976..cdb9e3f728 100644 --- a/include/deal.II/matrix_free/type_traits.h +++ b/include/deal.II/matrix_free/type_traits.h @@ -51,7 +51,7 @@ namespace internal // and its return type will be the same as local_element(), // that we expect to be T::value_type template - static decltype(std::declval().local_element(0)) + static decltype(std::declval().local_element(0)) detect(const U &); public: @@ -129,13 +129,13 @@ namespace internal detect(...); template - static decltype(std::declval().partitioners_are_compatible( + static decltype(std::declval().partitioners_are_compatible( std::declval())) detect(const U &); public: static const bool value = - std::is_same()))>::value; + std::is_same())), bool>::value; }; // We need to have a separate declaration for static const members @@ -153,7 +153,7 @@ namespace internal detect(...); template - static decltype(std::declval().begin()) + static decltype(std::declval().begin()) detect(const U &); public: @@ -176,7 +176,7 @@ namespace internal detect(...); template - static decltype(std::declval().shared_vector_data()) + static decltype(std::declval().shared_vector_data()) detect(const U &); public: @@ -228,12 +228,12 @@ namespace internal detect(...); template - static decltype(std::declval().update_ghost_values_start(0)) + static decltype(std::declval().update_ghost_values_start(0)) detect(const U &); public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; // We need to have a separate declaration for static const members @@ -257,7 +257,7 @@ namespace internal public: static const bool value = - !std::is_same()))>::value; + !std::is_same())), bool>::value; }; // We need to have a separate declaration for static const members