From 4b57be505da636de4c7654c59ebbfb585685dd9d Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Sun, 4 Nov 2012 23:10:23 +0000
Subject: [PATCH] Partial merge from the cmake branch: Remove compatibility
 code for old compilers.

git-svn-id: https://svn.dealii.org/trunk@27364 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/source/base/geometry_info.cc    | 30 -------------------------
 deal.II/source/lac/constraint_matrix.cc |  9 +-------
 deal.II/source/lac/vector.inst.in       | 12 ++++------
 3 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/deal.II/source/base/geometry_info.cc b/deal.II/source/base/geometry_info.cc
index 366731bc61..ded305d70b 100644
--- a/deal.II/source/base/geometry_info.cc
+++ b/deal.II/source/base/geometry_info.cc
@@ -1680,13 +1680,8 @@ template <int spacedim>
 void
 GeometryInfo<dim>::
 alternating_form_at_vertices
-#ifndef DEAL_II_ARRAY_ARG_BUG
     (const Point<spacedim> (&vertices)[vertices_per_cell],
      Tensor<spacedim-dim,spacedim> (&forms)[vertices_per_cell])
-#else
-    (const Point<spacedim> *vertices,
-     Tensor<spacedim-dim,spacedim> *forms)
-#endif
 {
                                    // for each of the vertices,
                                    // compute the alternating form
@@ -1744,52 +1739,32 @@ template
 void
 GeometryInfo<1>::
 alternating_form_at_vertices
-#ifndef DEAL_II_ARRAY_ARG_BUG
 (const Point<1> (&vertices)[vertices_per_cell],
  Tensor<1-1,1> (&forms)[vertices_per_cell])
-#else
-  (const Point<1> *vertices,
-   Tensor<1-1,1> *forms)
-#endif
   ;
 
 template
 void
 GeometryInfo<1>::
 alternating_form_at_vertices
-#ifndef DEAL_II_ARRAY_ARG_BUG
 (const Point<2> (&vertices)[vertices_per_cell],
  Tensor<2-1,2> (&forms)[vertices_per_cell])
-#else
-  (const Point<2> *vertices,
-   Tensor<2-1,2> *forms)
-#endif
   ;
 
 template
 void
 GeometryInfo<2>::
 alternating_form_at_vertices
-#ifndef DEAL_II_ARRAY_ARG_BUG
 (const Point<2> (&vertices)[vertices_per_cell],
  Tensor<2-2,2> (&forms)[vertices_per_cell])
-#else
-  (const Point<2> *vertices,
-   Tensor<2-2,2> *forms)
-#endif
   ;
 
 template
 void
 GeometryInfo<2>::
 alternating_form_at_vertices
-#ifndef DEAL_II_ARRAY_ARG_BUG
 (const Point<3> (&vertices)[vertices_per_cell],
  Tensor<3-2,3> (&forms)[vertices_per_cell])
-#else
-(const Point<3> *vertices,
- Tensor<3-2,3> *forms)
-#endif
   ;
 
 
@@ -1797,13 +1772,8 @@ template
 void
 GeometryInfo<3>::
 alternating_form_at_vertices
-#ifndef DEAL_II_ARRAY_ARG_BUG
 (const Point<3> (&vertices)[vertices_per_cell],
  Tensor<3-3,3> (&forms)[vertices_per_cell])
-#else
-(const Point<3> *vertices,
- Tensor<3-3,3> *forms)
-#endif
  ;
 
 
diff --git a/deal.II/source/lac/constraint_matrix.cc b/deal.II/source/lac/constraint_matrix.cc
index abc67f6225..c038a93238 100644
--- a/deal.II/source/lac/constraint_matrix.cc
+++ b/deal.II/source/lac/constraint_matrix.cc
@@ -41,14 +41,7 @@
 #include <algorithm>
 #include <numeric>
 #include <set>
-
-// we only need output streams, but older compilers did not provide
-// them in a separate include file
-#ifdef HAVE_STD_OSTREAM_HEADER
-#  include <ostream>
-#else
-#  include <iostream>
-#endif
+#include <ostream>
 
 DEAL_II_NAMESPACE_OPEN
 
diff --git a/deal.II/source/lac/vector.inst.in b/deal.II/source/lac/vector.inst.in
index 77dea0609b..2ac1a71afb 100644
--- a/deal.II/source/lac/vector.inst.in
+++ b/deal.II/source/lac/vector.inst.in
@@ -21,12 +21,10 @@ for (S1, S2 : REAL_SCALARS)
   {
     template
       bool
-      Vector<S1>::DEAL_II_MEMBER_OP_TEMPLATE_INST
-      operator==<S2>(const Vector<S2>&) const;
+      Vector<S1>::operator==<S2>(const Vector<S2>&) const;
     template
       S1
-      Vector<S1>::DEAL_II_MEMBER_OP_TEMPLATE_INST
-      operator*<S2>(const Vector<S2>&) const;
+      Vector<S1>::operator*<S2>(const Vector<S2>&) const;
     template
       void Vector<S1>::reinit<S2>(const Vector<S2>&, const bool);
   }
@@ -42,12 +40,10 @@ for (S1, S2 : COMPLEX_SCALARS)
   {
     template
       bool
-      Vector<S1>::DEAL_II_MEMBER_OP_TEMPLATE_INST
-      operator==<S2>(const Vector<S2>&) const;
+      Vector<S1>::operator==<S2>(const Vector<S2>&) const;
     template
       S1
-      Vector<S1>::DEAL_II_MEMBER_OP_TEMPLATE_INST
-      operator*<S2>(const Vector<S2>&) const;
+      Vector<S1>::operator*<S2>(const Vector<S2>&) const;
     template
       void Vector<S1>::reinit<S2>(const Vector<S2>&, const bool);
   }
-- 
2.39.5