]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Avoid link errors in GeometryInfo<0> 5780/head
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Tue, 23 Jan 2018 09:20:31 +0000 (10:20 +0100)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Tue, 23 Jan 2018 09:20:31 +0000 (10:20 +0100)
include/deal.II/base/geometry_info.h
source/base/geometry_info.cc

index 6662148f805472e261e74dd1eabf2f194797e915..3c6f3f93826a6036b2f0b1eb10dae0b39254e615 100644 (file)
@@ -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<unsigned int, vertices_per_cell> ucd_to_deal {{0}};
+  static const std::array<unsigned int, vertices_per_cell> 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<unsigned int, vertices_per_cell> dx_to_deal {{0}};
+  static const std::array<unsigned int, vertices_per_cell> dx_to_deal;
 };
 
 
index c9cb09cec696b0d9fd12ce4e0dea0e1aa69d9f04..77cc7ce4131b8cf30d38376fed2a25a1c78e3886 100644 (file)
@@ -54,12 +54,11 @@ template <int dim>
 constexpr std::array<unsigned int, GeometryInfo<dim>::vertices_per_cell>
 GeometryInfo<dim>::ucd_to_deal;
 
-constexpr std::array<unsigned int, GeometryInfo<0>::vertices_per_cell>
-GeometryInfo<0>::ucd_to_deal;
-
-constexpr std::array<unsigned int, GeometryInfo<0>::vertices_per_cell>
-GeometryInfo<0>::dx_to_deal;
+const std::array<unsigned int, GeometryInfo<0>::vertices_per_cell>
+GeometryInfo<0>::ucd_to_deal = {{0}};
 
+const std::array<unsigned int, GeometryInfo<0>::vertices_per_cell>
+GeometryInfo<0>::dx_to_deal = {{0}};
 
 template struct GeometryInfo<1>;
 template struct GeometryInfo<2>;

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.