From 8cef38ca45933402454fc4496861764839611c9b Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Mon, 2 Mar 2020 13:09:54 +0100 Subject: [PATCH] Fix compile error of GeometryInfo::unit_tangential_vectors on clang-4/5 --- include/deal.II/base/geometry_info.h | 70 ++++++++++++++-------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/include/deal.II/base/geometry_info.h b/include/deal.II/base/geometry_info.h index b53b6c57a5..966b584b7b 100644 --- a/include/deal.II/base/geometry_info.h +++ b/include/deal.II/base/geometry_info.h @@ -71,7 +71,7 @@ namespace internal static constexpr std::array, 0>, 2> unit_tangential_vectors() { - return {{{}, {}}}; + return {{{{}}, {{}}}}; } static constexpr std::array @@ -126,10 +126,10 @@ namespace internal static constexpr std::array, 1>, 4> unit_tangential_vectors() { - return {{{Tensor<1, 2>{{0, -1}}}, - {Tensor<1, 2>{{0, 1}}}, - {Tensor<1, 2>{{1, 0}}}, - {Tensor<1, 2>{{-1, 0}}}}}; + return {{{{Tensor<1, 2>{{0, -1}}}}, + {{Tensor<1, 2>{{0, 1}}}}, + {{Tensor<1, 2>{{1, 0}}}}, + {{Tensor<1, 2>{{-1, 0}}}}}}; } static constexpr std::array @@ -186,12 +186,12 @@ namespace internal static constexpr std::array, 2>, 6> unit_tangential_vectors() { - return {{{Tensor<1, 3>{{0, -1, 0}}, Tensor<1, 3>{{0, 0, 1}}}, - {Tensor<1, 3>{{0, 1, 0}}, Tensor<1, 3>{{0, 0, 1}}}, - {Tensor<1, 3>{{0, 0, -1}}, Tensor<1, 3>{{1, 0, 0}}}, - {Tensor<1, 3>{{0, 0, 1}}, Tensor<1, 3>{{1, 0, 0}}}, - {Tensor<1, 3>{{-1, 0, 0}}, Tensor<1, 3>{{0, 1, 0}}}, - {Tensor<1, 3>{{1, 0, 0}}, Tensor<1, 3>{{0, 1, 0}}}}}; + return {{{{Tensor<1, 3>{{0, -1, 0}}, Tensor<1, 3>{{0, 0, 1}}}}, + {{Tensor<1, 3>{{0, 1, 0}}, Tensor<1, 3>{{0, 0, 1}}}}, + {{Tensor<1, 3>{{0, 0, -1}}, Tensor<1, 3>{{1, 0, 0}}}}, + {{Tensor<1, 3>{{0, 0, 1}}, Tensor<1, 3>{{1, 0, 0}}}}, + {{Tensor<1, 3>{{-1, 0, 0}}, Tensor<1, 3>{{0, 1, 0}}}}, + {{Tensor<1, 3>{{1, 0, 0}}, Tensor<1, 3>{{0, 1, 0}}}}}}; } static constexpr std::array @@ -272,30 +272,30 @@ namespace internal static constexpr std::array, 3>, 8> unit_tangential_vectors() { - return {{{Tensor<1, 4>{{0, -1, 0, 0}}, - Tensor<1, 4>{{0, 0, 1, 0}}, - Tensor<1, 4>{{0, 0, 0, 1}}}, - {Tensor<1, 4>{{0, 1, 0, 0}}, - Tensor<1, 4>{{0, 0, 1, 0}}, - Tensor<1, 4>{{0, 0, 0, 1}}}, - {Tensor<1, 4>{{0, 0, -1, 0}}, - Tensor<1, 4>{{0, 0, 0, 1}}, - Tensor<1, 4>{{1, 0, 0, 0}}}, - {Tensor<1, 4>{{0, 0, 1, 0}}, - Tensor<1, 4>{{0, 0, 0, 1}}, - Tensor<1, 4>{{1, 0, 0, 0}}}, - {Tensor<1, 4>{{0, 0, 0, -1}}, - Tensor<1, 4>{{1, 0, 0, 0}}, - Tensor<1, 4>{{0, 1, 0, 0}}}, - {Tensor<1, 4>{{0, 0, 0, 1}}, - Tensor<1, 4>{{1, 0, 0, 0}}, - Tensor<1, 4>{{0, 1, 0, 0}}}, - {Tensor<1, 4>{{-1, 0, 0, 0}}, - Tensor<1, 4>{{0, 1, 0, 0}}, - Tensor<1, 4>{{0, 0, 1, 0}}}, - {Tensor<1, 4>{{1, 0, 0, 0}}, - Tensor<1, 4>{{0, 1, 0, 0}}, - Tensor<1, 4>{{0, 0, 1, 0}}}}}; + return {{{{Tensor<1, 4>{{0, -1, 0, 0}}, + Tensor<1, 4>{{0, 0, 1, 0}}, + Tensor<1, 4>{{0, 0, 0, 1}}}}, + {{Tensor<1, 4>{{0, 1, 0, 0}}, + Tensor<1, 4>{{0, 0, 1, 0}}, + Tensor<1, 4>{{0, 0, 0, 1}}}}, + {{Tensor<1, 4>{{0, 0, -1, 0}}, + Tensor<1, 4>{{0, 0, 0, 1}}, + Tensor<1, 4>{{1, 0, 0, 0}}}}, + {{Tensor<1, 4>{{0, 0, 1, 0}}, + Tensor<1, 4>{{0, 0, 0, 1}}, + Tensor<1, 4>{{1, 0, 0, 0}}}}, + {{Tensor<1, 4>{{0, 0, 0, -1}}, + Tensor<1, 4>{{1, 0, 0, 0}}, + Tensor<1, 4>{{0, 1, 0, 0}}}}, + {{Tensor<1, 4>{{0, 0, 0, 1}}, + Tensor<1, 4>{{1, 0, 0, 0}}, + Tensor<1, 4>{{0, 1, 0, 0}}}}, + {{Tensor<1, 4>{{-1, 0, 0, 0}}, + Tensor<1, 4>{{0, 1, 0, 0}}, + Tensor<1, 4>{{0, 0, 1, 0}}}}, + {{Tensor<1, 4>{{1, 0, 0, 0}}, + Tensor<1, 4>{{0, 1, 0, 0}}, + Tensor<1, 4>{{0, 0, 1, 0}}}}}}; } static constexpr std::array -- 2.39.5