From aac167bf76824e7eb58e0f318385d0218b75be3b Mon Sep 17 00:00:00 2001
From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 6 May 2002 07:41:55 +0000
Subject: [PATCH] Remove pre-gcc-2.95 cruft.

git-svn-id: https://svn.dealii.org/trunk@5813 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/deal.II/include/dofs/dof_handler.h       | 16 +++-------------
 deal.II/deal.II/include/fe/fe_base.h             |  9 +--------
 deal.II/deal.II/include/grid/tria.h              | 14 ++++++++++----
 .../deal.II/include/multigrid/mg_dof_handler.h   | 15 +++------------
 deal.II/deal.II/source/numerics/histogram.cc     | 12 +-----------
 5 files changed, 18 insertions(+), 48 deletions(-)

diff --git a/deal.II/deal.II/include/dofs/dof_handler.h b/deal.II/deal.II/include/dofs/dof_handler.h
index 4919884813..9c6f0a97e8 100644
--- a/deal.II/deal.II/include/dofs/dof_handler.h
+++ b/deal.II/deal.II/include/dofs/dof_handler.h
@@ -1149,20 +1149,10 @@ class DoFHandler  :  public Subscriptor,
 				      */
     std::vector<unsigned int>      vertex_dofs;
 
-
-#if (__GNUC__==2) && (__GNUC_MINOR__ < 95)
-				     // this seems to be disallowed
-				     // by the standard, so gcc2.95
-				     // does not accept it
-    friend class DoFObjectAccessor<1, dim>;
-    friend class DoFObjectAccessor<2, dim>;
-    friend class DoFObjectAccessor<3, dim>;
-#else
-				     // this, however, may grant
-				     // access to too many classes,
-				     // but ...
+				     /**
+				      * Make accessor objects friends.
+				      */
     template <int dim1, int dim2> friend class DoFObjectAccessor;
-#endif
 };
 
 
diff --git a/deal.II/deal.II/include/fe/fe_base.h b/deal.II/deal.II/include/fe/fe_base.h
index c5126fe153..cb0f732e56 100644
--- a/deal.II/deal.II/include/fe/fe_base.h
+++ b/deal.II/deal.II/include/fe/fe_base.h
@@ -808,11 +808,7 @@ class FiniteElementBase : public Subscriptor,
 				      * should be resized to zero
 				      * size.
 				      */
-#if !((__GNUC__==2) && (__GNUC_MINOR__==95))
     FullMatrix<double> restriction[GeometryInfo<dim>::children_per_cell];
-#else
-    FullMatrix<double> restriction[1 << dim];
-#endif
 
     				     /**
 				      * Array of embedding
@@ -827,11 +823,8 @@ class FiniteElementBase : public Subscriptor,
 				      * should be resized to zero
 				      * size.
 				      */
-#if ! ((__GNUC__==2) && (__GNUC_MINOR__==95))
     FullMatrix<double> prolongation[GeometryInfo<dim>::children_per_cell];
-#else
-    FullMatrix<double> prolongation[1 << dim];
-#endif
+
    				     /**
 				      * Specify the constraints which
 				      * the dofs on the two sides of a
diff --git a/deal.II/deal.II/include/grid/tria.h b/deal.II/deal.II/include/grid/tria.h
index f847ad2090..6927cc403c 100644
--- a/deal.II/deal.II/include/grid/tria.h
+++ b/deal.II/deal.II/include/grid/tria.h
@@ -48,11 +48,17 @@ template <int dim> class MGDoFHandler;
 template <int dim>
 struct CellData
 {
-#if !((__GNUC__==2) && (__GNUC_MINOR__==95))
+				     /**
+				      * Indices of the vertices of
+				      * this cell.
+				      */
     int           vertices[GeometryInfo<dim>::vertices_per_cell];
-#else
-    int           vertices[1 << dim];
-#endif
+
+				     /**
+				      * Material indicator of this
+				      * cell. May be used to denote
+				      * different coefficients, etc.
+				      */
     unsigned char material_id;
 
 				     /**
diff --git a/deal.II/deal.II/include/multigrid/mg_dof_handler.h b/deal.II/deal.II/include/multigrid/mg_dof_handler.h
index ad8a5bab5d..3e09a4ebfd 100644
--- a/deal.II/deal.II/include/multigrid/mg_dof_handler.h
+++ b/deal.II/deal.II/include/multigrid/mg_dof_handler.h
@@ -981,19 +981,10 @@ class MGDoFHandler : public DoFHandler<dim>
 				      */
     std::vector<unsigned int>      mg_used_dofs;
 
-#if (__GNUC__==2) && (__GNUC_MINOR__ < 95)  
-				     // this seems to be disallowed
-				     // by the standard, so gcc2.95
-				     // does not accept it
-    friend class MGDoFObjectAccessor<1, dim>;
-    friend class MGDoFObjectAccessor<2, dim>;
-    friend class MGDoFObjectAccessor<3, dim>;
-#else
-				     // this, however, may grant
-				     // access to too many classes,
-				     // but ...
+				     /**
+				      * Make accessor objects friends.
+				      */
     template <int dim1, int dim2> friend class MGDoFObjectAccessor;
-#endif
 };
 
 
diff --git a/deal.II/deal.II/source/numerics/histogram.cc b/deal.II/deal.II/source/numerics/histogram.cc
index 1003659a59..1e73462046 100644
--- a/deal.II/deal.II/source/numerics/histogram.cc
+++ b/deal.II/deal.II/source/numerics/histogram.cc
@@ -93,17 +93,7 @@ void Histogram::evaluate (const typename std::vector<Vector<number> > &values,
       {
 	typedef bool (*comparator) (const number, const number);
 	const comparator logarithmic_less_function
-	  =
-#ifdef __GNU_CC
-#if (__GNUC__==2) && (__GNUC_MINOR__ < 95)
-	  &logarithmic_less<number>
-#else
-	  &Histogram::template logarithmic_less<number>
-#endif
-#else
-	  &Histogram::template logarithmic_less<number>	  
-#endif
-	  ;
+	  = &Histogram::template logarithmic_less<number>;
 	
 	min_value = *std::min_element(values[0].begin(),
 				      values[0].end(),
-- 
2.39.5