From: Daniel Arndt Date: Tue, 23 Jan 2018 09:20:31 +0000 (+0100) Subject: Avoid link errors in GeometryInfo<0> X-Git-Tag: v9.0.0-rc1~536^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5780%2Fhead;p=dealii.git Avoid link errors in GeometryInfo<0> --- diff --git a/include/deal.II/base/geometry_info.h b/include/deal.II/base/geometry_info.h index 6662148f80..3c6f3f9382 100644 --- a/include/deal.II/base/geometry_info.h +++ b/include/deal.II/base/geometry_info.h @@ -1121,7 +1121,7 @@ struct GeometryInfo<0> * with the UCD numbering, this field can also be used like a * old_to_lexicographic mapping. */ - static constexpr std::array ucd_to_deal {{0}}; + static const std::array ucd_to_deal; /** * Rearrange vertices for OpenDX output. For a cell being written in OpenDX @@ -1136,7 +1136,7 @@ struct GeometryInfo<0> * out << cell->vertex(dx_to_deal[i]); * @endcode */ - static constexpr std::array dx_to_deal {{0}}; + static const std::array dx_to_deal; }; diff --git a/source/base/geometry_info.cc b/source/base/geometry_info.cc index c9cb09cec6..77cc7ce413 100644 --- a/source/base/geometry_info.cc +++ b/source/base/geometry_info.cc @@ -54,12 +54,11 @@ template constexpr std::array::vertices_per_cell> GeometryInfo::ucd_to_deal; -constexpr std::array::vertices_per_cell> -GeometryInfo<0>::ucd_to_deal; - -constexpr std::array::vertices_per_cell> -GeometryInfo<0>::dx_to_deal; +const std::array::vertices_per_cell> +GeometryInfo<0>::ucd_to_deal = {{0}}; +const std::array::vertices_per_cell> +GeometryInfo<0>::dx_to_deal = {{0}}; template struct GeometryInfo<1>; template struct GeometryInfo<2>;