From: Wolfgang Bangerth Date: Wed, 23 Feb 2000 10:33:44 +0000 (+0000) Subject: Disable initialization of variables for egcs1.1 X-Git-Tag: v8.0.0~20880 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=119a5acdc3ba1ae45c9bfda9cef1999bb9fbe743;p=dealii.git 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 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 <>