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

diff --git a/deal.II/include/deal.II/base/conditional_ostream.h b/deal.II/include/deal.II/base/conditional_ostream.h
index d21721d4219c826f267d415aed65ace4f7350268..a4c799f48b347b3cb846a55c77055f8bb73d6d39 100644 (file)
--- 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 7a0523028a6c441c742ec24dc2984a3e94d622dd..b42e689aa9390a3c1dd8e03512720949ec80e62a 100644 (file)
--- 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 cd6485273dac9ed618ded6cc0b04ed99335da57b..e2b005a2d7053b78e1cc80cd549f5ca2def1ad35 100644 (file)
--- 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 c88d47b89aa1040c79644d3b569bf8004f5afd66..8b257f0d35717cc0a620b248c18570ebff5c7695 100644 (file)
--- 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 00cb35584f86f83e27c22f69d0f960e2a88c2cb4..9aa1a6108211468c695081ec1fb3441e9f981e51 100644 (file)
--- 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 5253d4868f31d7774b7128f4e66010f47b773695..f6e1c7d6edc033ca7017f7d7032189c298d39245 100644 (file)
--- 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 5ffe92aa121c6cf960d225ea3515ac535905e2b2..0c7795810e1688f5d7aa7353cb8870a94e7f9e2f 100644 (file)
--- 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 4424126ae5474ef1e096f94336f20b388459821b..9e17f4085f23dab3978039c5e24daf80bb3b3a24 100644 (file)
--- 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 37f49679d919068f6116a26095cfbd0d9fc270a7..dcd71af19f15e8558a7ab5a20846b43bdcc05d1e 100644 (file)
--- 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 e76b9fd075b4a4e7797eefbb4480bf74302d3b12..2547f96bded4f8b1e99d175e848168922672dac3 100644 (file)
--- 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 3499f24ed6797e39a4c863811e6337521d8c956c..b86cd104cbec54316ee3068f73b918475a2ae527 100644 (file)
--- 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>