From 650d282c6d960a3967d8fb7302d3965286a5b2b0 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Fri, 13 Mar 2020 10:25:12 +0100 Subject: [PATCH] Replace a few types_are_equal by std::is_same --- tests/matrix_free/get_functions_common.h | 4 ++-- tests/matrix_free/matrix_vector_faces_common.h | 4 ++-- tests/matrix_free/parallel_multigrid_adaptive_06.cc | 4 ++-- tests/matrix_free/parallel_multigrid_adaptive_06ref.cc | 4 ++-- tests/matrix_free/parallel_multigrid_adaptive_07.cc | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/matrix_free/get_functions_common.h b/tests/matrix_free/get_functions_common.h index 394dc3cd1a..0d85d7a857 100644 --- a/tests/matrix_free/get_functions_common.h +++ b/tests/matrix_free/get_functions_common.h @@ -161,7 +161,7 @@ public: // for doubles, use a stricter condition than // for floats for the relative error size - if (types_are_equal::value == true) + if (std::is_same::value == true) { deallog << "Error function values: " << errors[0] / total[0] << std::endl; @@ -184,7 +184,7 @@ public: const double output4 = total[4] == 0 ? 0. : errors[4] / total[4]; deallog << "Error function Hessians: " << output4 << std::endl; } - else if (types_are_equal::value == true) + else if (std::is_same::value == true) { deallog << "Error function values: " << errors[0] / total[0] << std::endl; diff --git a/tests/matrix_free/matrix_vector_faces_common.h b/tests/matrix_free/matrix_vector_faces_common.h index b2e8e1334d..7e91396c31 100644 --- a/tests/matrix_free/matrix_vector_faces_common.h +++ b/tests/matrix_free/matrix_vector_faces_common.h @@ -761,7 +761,7 @@ do_test(const DoFHandler & dof, const AffineConstraints &constraints, const bool also_test_parallel = false) { - if (types_are_equal::value == true) + if (std::is_same::value == true) deallog.push("float"); deallog << "Testing " << dof.get_fe().get_name(); @@ -872,7 +872,7 @@ do_test(const DoFHandler & dof, } deallog << std::endl; - if (types_are_equal::value == true) + if (std::is_same::value == true) deallog.pop(); } diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06.cc b/tests/matrix_free/parallel_multigrid_adaptive_06.cc index d1b7dd2669..9cb419eac4 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_06.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_06.cc @@ -209,7 +209,7 @@ template void do_test(const DoFHandler &dof, const unsigned int nb) { - if (types_are_equal::value == true) + if (std::is_same::value == true) { deallog.push("float"); } @@ -376,7 +376,7 @@ do_test(const DoFHandler &dof, const unsigned int nb) solver.solve(fine_matrix, sol, in, preconditioner); } - if (types_are_equal::value == true) + if (std::is_same::value == true) deallog.pop(); fine_matrix.clear(); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc b/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc index 438c9b5bd2..77b07516a7 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc @@ -125,7 +125,7 @@ template void do_test(const DoFHandler &dof) { - if (types_are_equal::value == true) + if (std::is_same::value == true) { deallog.push("float"); } @@ -285,7 +285,7 @@ do_test(const DoFHandler &dof) solver.solve(fine_matrix, sol, in, preconditioner); } - if (types_are_equal::value == true) + if (std::is_same::value == true) deallog.pop(); fine_matrix.clear(); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_07.cc b/tests/matrix_free/parallel_multigrid_adaptive_07.cc index 600585724f..b48fb53417 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_07.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_07.cc @@ -222,7 +222,7 @@ void do_test(const std::vector *> &dof) { const unsigned int nb = 2; - if (types_are_equal::value == true) + if (std::is_same::value == true) { deallog.push("float"); } @@ -409,7 +409,7 @@ do_test(const std::vector *> &dof) solver.solve(fine_matrix, sol, in, preconditioner); } - if (types_are_equal::value == true) + if (std::is_same::value == true) deallog.pop(); fine_matrix.clear(); -- 2.39.5