Disable initialization of variables for egcs1.1

git-svn-id: https://svn.dealii.org/trunk@2484 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/source/grid/geometry_info.cc b/deal.II/deal.II/source/grid/geometry_info.cc
index 023896c41ca31d215e2400f50c808e77c6a6da94..62a8412a51d1cc51da496c3dc9e3e69de465c448 100644 (file)
--- a/deal.II/deal.II/source/grid/geometry_info.cc
+++ b/deal.II/deal.II/source/grid/geometry_info.cc
@@ -15,11 +15,18 @@
 #include <grid/geometry_info.h>
 
 
-const unsigned int GeometryInfo<deal_II_dimension>::vertices_per_cell;
-const unsigned int GeometryInfo<deal_II_dimension>::lines_per_cell;
-const unsigned int GeometryInfo<deal_II_dimension>::quads_per_cell;
-const unsigned int GeometryInfo<deal_II_dimension>::hexes_per_cell;
-const unsigned int GeometryInfo<deal_II_dimension>::children_per_cell;
+// egcs 1.1 does not need these definitions of static member
+// variables, as later compilers should need. on the other hand, if we
+// define them, then egcs1.1 wants initialization, which we would have
+// to mirror from the .h file. rather, we omit it here
+
+#if ! ((__GNUC__==2) && (__GNUC_MINOR__ < 95))
+  const unsigned int GeometryInfo<deal_II_dimension>::vertices_per_cell;
+  const unsigned int GeometryInfo<deal_II_dimension>::lines_per_cell;
+  const unsigned int GeometryInfo<deal_II_dimension>::quads_per_cell;
+  const unsigned int GeometryInfo<deal_II_dimension>::hexes_per_cell;
+  const unsigned int GeometryInfo<deal_II_dimension>::children_per_cell;
+#endif
 
 
 template <>