From: Rene Gassmoeller Date: Sat, 22 Jul 2017 00:03:17 +0000 (-0600) Subject: Add instantiations X-Git-Tag: v9.0.0-rc1~1396^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c09e553b049f7e0059b6a01ecea2ffdb61d8cf79;p=dealii.git Add instantiations --- diff --git a/include/deal.II/base/geometry_info.h b/include/deal.II/base/geometry_info.h index caafecd2fb..edc4075fb1 100644 --- a/include/deal.II/base/geometry_info.h +++ b/include/deal.II/base/geometry_info.h @@ -946,7 +946,7 @@ struct GeometryInfo<0> * with the UCD numbering, this field can also be used like a * old_to_lexicographic mapping. */ - static constexpr unsigned int ucd_to_deal[vertices_per_cell] = {0}; + static const unsigned int ucd_to_deal[vertices_per_cell]; /** * Rearrange vertices for OpenDX output. For a cell being written in OpenDX @@ -961,7 +961,7 @@ struct GeometryInfo<0> * out << cell->vertex(dx_to_deal[i]); * @endcode */ - static constexpr unsigned int dx_to_deal[vertices_per_cell] = {0}; + static const unsigned int dx_to_deal[vertices_per_cell]; }; diff --git a/source/base/geometry_info.cc b/source/base/geometry_info.cc index 3160005b8e..a836ee20e7 100644 --- a/source/base/geometry_info.cc +++ b/source/base/geometry_info.cc @@ -106,6 +106,8 @@ GeometryInfo<4>::opposite_face[faces_per_cell] = { 1, 0, 3, 2, 5, 4, 7, 6 }; +const unsigned int GeometryInfo<0>::ucd_to_deal[GeometryInfo<0>::vertices_per_cell] + = {0}; template <> const unsigned int GeometryInfo<1>::ucd_to_deal[GeometryInfo<1>::vertices_per_cell] @@ -140,6 +142,9 @@ const unsigned int GeometryInfo<4>::ucd_to_deal[GeometryInfo<4>::vertices_per_ce }; +const unsigned int GeometryInfo<0>::dx_to_deal[GeometryInfo<0>::vertices_per_cell] + = {0}; + template <> const unsigned int GeometryInfo<1>::dx_to_deal[GeometryInfo<1>::vertices_per_cell] = { 0, 1}; @@ -1827,6 +1832,7 @@ alternating_form_at_vertices } +template struct GeometryInfo<0>; template struct GeometryInfo<1>; template struct GeometryInfo<2>; template struct GeometryInfo<3>;