From b2025f1abf148fc1f584ead61da3ee5b5ee461ef Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 23 Feb 2000 10:33:44 +0000 Subject: [PATCH] Disable initialization of variables for egcs1.1 git-svn-id: https://svn.dealii.org/trunk@2484 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/grid/geometry_info.cc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/deal.II/deal.II/source/grid/geometry_info.cc b/deal.II/deal.II/source/grid/geometry_info.cc index 023896c41c..62a8412a51 100644 --- 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 -const unsigned int GeometryInfo::vertices_per_cell; -const unsigned int GeometryInfo::lines_per_cell; -const unsigned int GeometryInfo::quads_per_cell; -const unsigned int GeometryInfo::hexes_per_cell; -const unsigned int GeometryInfo::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::vertices_per_cell; + const unsigned int GeometryInfo::lines_per_cell; + const unsigned int GeometryInfo::quads_per_cell; + const unsigned int GeometryInfo::hexes_per_cell; + const unsigned int GeometryInfo::children_per_cell; +#endif template <> -- 2.39.5