From 9761730d13a8df759e4966ebd2a1d9278186669e Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 22 May 2020 16:33:31 -0500 Subject: [PATCH] unify check We had another DEAL_II_CONSTEXPR_BUG check in our CMake configuration. Let's just use DEAL_II_CXX14_CONSTEXPR_BUG instead. --- cmake/checks/check_03_compiler_bugs.cmake | 16 ---------------- include/deal.II/base/geometry_info.h | 4 ++-- source/base/geometry_info.cc | 10 +++++----- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/cmake/checks/check_03_compiler_bugs.cmake b/cmake/checks/check_03_compiler_bugs.cmake index 5eb17500e8..d090205882 100644 --- a/cmake/checks/check_03_compiler_bugs.cmake +++ b/cmake/checks/check_03_compiler_bugs.cmake @@ -33,22 +33,6 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel" AND CMAKE_CXX_COMPILER_VERSION VERSION_ ENDIF() -# -# gcc-4.8.1 has some problems with the constexpr "vertices_per_cell" in the -# definition of alternating_form_at_vertices. -# -# TODO: Write a unit test. -# -# For now, just enable the workaround for Windows targets -# -# - Matthias Maier, 2013 -# -IF( CMAKE_SYSTEM_NAME MATCHES "CYGWIN" - OR CMAKE_SYSTEM_NAME MATCHES "Windows" ) - SET(DEAL_II_CONSTEXPR_BUG TRUE) -ENDIF() - - # # Intel 16.0.1 produces wrong code that creates a race condition in # tests/fe/curl_curl_01.debug but 16.0.2 is known to work. Blacklist this diff --git a/include/deal.II/base/geometry_info.h b/include/deal.II/base/geometry_info.h index 5fab2b0419..00420b133e 100644 --- a/include/deal.II/base/geometry_info.h +++ b/include/deal.II/base/geometry_info.h @@ -2475,7 +2475,7 @@ struct GeometryInfo template static void alternating_form_at_vertices -#ifndef DEAL_II_CONSTEXPR_BUG +#ifndef DEAL_II_CXX14_CONSTEXPR_BUG (const Point (&vertices)[vertices_per_cell], Tensor (&forms)[vertices_per_cell]); #else @@ -4744,7 +4744,7 @@ template template inline void GeometryInfo::alternating_form_at_vertices -# ifndef DEAL_II_CONSTEXPR_BUG +# ifndef DEAL_II_CXX14_CONSTEXPR_BUG (const Point (&vertices)[vertices_per_cell], Tensor (&forms)[vertices_per_cell]) # else diff --git a/source/base/geometry_info.cc b/source/base/geometry_info.cc index 6b70f9da80..435cbd66f4 100644 --- a/source/base/geometry_info.cc +++ b/source/base/geometry_info.cc @@ -87,7 +87,7 @@ template struct GeometryInfo<4>; template void GeometryInfo<1>::alternating_form_at_vertices -#ifndef DEAL_II_CONSTEXPR_BUG +#ifndef DEAL_II_CXX14_CONSTEXPR_BUG (const Point<1> (&)[vertices_per_cell], Tensor<1 - 1, 1> (&)[vertices_per_cell]) #else @@ -97,7 +97,7 @@ GeometryInfo<1>::alternating_form_at_vertices template void GeometryInfo<1>::alternating_form_at_vertices -#ifndef DEAL_II_CONSTEXPR_BUG +#ifndef DEAL_II_CXX14_CONSTEXPR_BUG (const Point<2> (&)[vertices_per_cell], Tensor<2 - 1, 2> (&)[vertices_per_cell]) #else @@ -107,7 +107,7 @@ GeometryInfo<1>::alternating_form_at_vertices template void GeometryInfo<2>::alternating_form_at_vertices -#ifndef DEAL_II_CONSTEXPR_BUG +#ifndef DEAL_II_CXX14_CONSTEXPR_BUG (const Point<2> (&vertices)[vertices_per_cell], Tensor<2 - 2, 2> (&forms)[vertices_per_cell]) #else @@ -117,7 +117,7 @@ GeometryInfo<2>::alternating_form_at_vertices template void GeometryInfo<2>::alternating_form_at_vertices -#ifndef DEAL_II_CONSTEXPR_BUG +#ifndef DEAL_II_CXX14_CONSTEXPR_BUG (const Point<3> (&vertices)[vertices_per_cell], Tensor<3 - 2, 3> (&forms)[vertices_per_cell]) #else @@ -128,7 +128,7 @@ GeometryInfo<2>::alternating_form_at_vertices template void GeometryInfo<3>::alternating_form_at_vertices -#ifndef DEAL_II_CONSTEXPR_BUG +#ifndef DEAL_II_CXX14_CONSTEXPR_BUG (const Point<3> (&vertices)[vertices_per_cell], Tensor<3 - 3, 3> (&forms)[vertices_per_cell]) #else -- 2.39.5