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

git-svn-id: https://svn.dealii.org/trunk@27368 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/include/deal.II/base/conditional_ostream.h       | 6 +-----
 deal.II/include/deal.II/base/data_out_base.h             | 8 +-------
 deal.II/include/deal.II/base/geometry_info.h             | 5 -----
 deal.II/include/deal.II/base/table_handler.h             | 8 +-------
 deal.II/include/deal.II/base/table_indices.h             | 8 +-------
 deal.II/include/deal.II/base/tensor_base.h               | 8 +-------
 deal.II/include/deal.II/fe/block_mask.h                  | 6 +-----
 deal.II/include/deal.II/fe/component_mask.h              | 6 +-----
 deal.II/include/deal.II/grid/tria_iterator.h             | 8 +-------
 .../include/deal.II/lac/chunk_sparse_matrix.templates.h  | 9 +--------
 deal.II/include/deal.II/lac/sparse_matrix.templates.h    | 9 +--------
 11 files changed, 10 insertions(+), 71 deletions(-)

diff --git a/deal.II/include/deal.II/base/conditional_ostream.h b/deal.II/include/deal.II/base/conditional_ostream.h
index d21721d421..a4c799f48b 100644
--- a/deal.II/include/deal.II/base/conditional_ostream.h
+++ b/deal.II/include/deal.II/base/conditional_ostream.h
@@ -14,11 +14,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef HAVE_STD_OSTREAM_HEADER
-#  include <ostream>
-#else
-#  include <iostream>
-#endif
+#include <ostream>
 
 DEAL_II_NAMESPACE_OPEN
 
diff --git a/deal.II/include/deal.II/base/data_out_base.h b/deal.II/include/deal.II/base/data_out_base.h
index 7a0523028a..b42e689aa9 100644
--- a/deal.II/include/deal.II/base/data_out_base.h
+++ b/deal.II/include/deal.II/base/data_out_base.h
@@ -31,13 +31,7 @@
 #  include <string.h>
 #endif
 
-// 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/include/deal.II/base/geometry_info.h b/deal.II/include/deal.II/base/geometry_info.h
index cd6485273d..e2b005a2d7 100644
--- a/deal.II/include/deal.II/base/geometry_info.h
+++ b/deal.II/include/deal.II/base/geometry_info.h
@@ -2162,13 +2162,8 @@ struct GeometryInfo
     static
     void
     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
       ;
 
                                      /**
diff --git a/deal.II/include/deal.II/base/table_handler.h b/deal.II/include/deal.II/base/table_handler.h
index c88d47b89a..8b257f0d35 100644
--- a/deal.II/include/deal.II/base/table_handler.h
+++ b/deal.II/include/deal.II/base/table_handler.h
@@ -21,13 +21,7 @@
 #include <string>
 #include <fstream>
 
-// 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>
 
 #include <boost/variant.hpp>
 #include <boost/serialization/map.hpp>
diff --git a/deal.II/include/deal.II/base/table_indices.h b/deal.II/include/deal.II/base/table_indices.h
index 00cb35584f..9aa1a61082 100644
--- a/deal.II/include/deal.II/base/table_indices.h
+++ b/deal.II/include/deal.II/base/table_indices.h
@@ -16,13 +16,7 @@
 #include <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>
 
-// 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>
 
 
 
diff --git a/deal.II/include/deal.II/base/tensor_base.h b/deal.II/include/deal.II/base/tensor_base.h
index 5253d4868f..f6e1c7d6ed 100644
--- a/deal.II/include/deal.II/base/tensor_base.h
+++ b/deal.II/include/deal.II/base/tensor_base.h
@@ -24,15 +24,9 @@
 #include <vector>
 
 #include <cmath>
+#include <ostream>
 
 DEAL_II_NAMESPACE_OPEN
-// 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
 
 template <typename number> class Vector;
 
diff --git a/deal.II/include/deal.II/fe/block_mask.h b/deal.II/include/deal.II/fe/block_mask.h
index 5ffe92aa12..0c7795810e 100644
--- a/deal.II/include/deal.II/fe/block_mask.h
+++ b/deal.II/include/deal.II/fe/block_mask.h
@@ -17,11 +17,7 @@
 #include <deal.II/base/memory_consumption.h>
 
 #include <vector>
-#ifdef HAVE_STD_IOSFWD_HEADER
-#  include <iosfwd>
-#else
-#  include <iostream>
-#endif
+#include <iosfwd>
 
 DEAL_II_NAMESPACE_OPEN
 
diff --git a/deal.II/include/deal.II/fe/component_mask.h b/deal.II/include/deal.II/fe/component_mask.h
index 4424126ae5..9e17f4085f 100644
--- a/deal.II/include/deal.II/fe/component_mask.h
+++ b/deal.II/include/deal.II/fe/component_mask.h
@@ -17,11 +17,7 @@
 #include <deal.II/base/memory_consumption.h>
 
 #include <vector>
-#ifdef HAVE_STD_IOSFWD_HEADER
-#  include <iosfwd>
-#else
-#  include <iostream>
-#endif
+#include <iosfwd>
 
 DEAL_II_NAMESPACE_OPEN
 
diff --git a/deal.II/include/deal.II/grid/tria_iterator.h b/deal.II/include/deal.II/grid/tria_iterator.h
index 37f49679d9..dcd71af19f 100644
--- a/deal.II/include/deal.II/grid/tria_iterator.h
+++ b/deal.II/include/deal.II/grid/tria_iterator.h
@@ -24,13 +24,7 @@
 
 #include <iterator>
 
-// 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/include/deal.II/lac/chunk_sparse_matrix.templates.h b/deal.II/include/deal.II/lac/chunk_sparse_matrix.templates.h
index e76b9fd075..2547f96bde 100644
--- a/deal.II/include/deal.II/lac/chunk_sparse_matrix.templates.h
+++ b/deal.II/include/deal.II/lac/chunk_sparse_matrix.templates.h
@@ -19,14 +19,7 @@
 #include <deal.II/lac/full_matrix.h>
 
 
-// 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>
 #include <iomanip>
 #include <algorithm>
 #include <functional>
diff --git a/deal.II/include/deal.II/lac/sparse_matrix.templates.h b/deal.II/include/deal.II/lac/sparse_matrix.templates.h
index 3499f24ed6..b86cd104cb 100644
--- a/deal.II/include/deal.II/lac/sparse_matrix.templates.h
+++ b/deal.II/include/deal.II/lac/sparse_matrix.templates.h
@@ -26,14 +26,7 @@
 #include <deal.II/lac/compressed_simple_sparsity_pattern.h>
 #include <deal.II/lac/vector_memory.h>
 
-// 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>
 #include <iomanip>
 #include <algorithm>
 #include <functional>
-- 
2.39.5