From: maier Date: Wed, 12 Sep 2012 11:32:53 +0000 (+0000) Subject: Remove obsolete HAVE_STD_OSTREAM checks X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=786cada0bcf3469315bc5c34ec86d702333c6840;p=dealii-svn.git Remove obsolete HAVE_STD_OSTREAM checks git-svn-id: https://svn.dealii.org/branches/branch_cmake@26307 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 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 -#ifdef HAVE_STD_OSTREAM_HEADER -# include -#else -# include -#endif +#include 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 #endif -// we only need output streams, but older compilers did not provide -// them in a separate include file -#ifdef HAVE_STD_OSTREAM_HEADER -# include -#else -# include -#endif +#include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/include/deal.II/base/exceptions.h b/deal.II/include/deal.II/base/exceptions.h index 87c3c8fc09..9d1fe27291 100644 --- a/deal.II/include/deal.II/base/exceptions.h +++ b/deal.II/include/deal.II/base/exceptions.h @@ -21,14 +21,7 @@ #include #include - -// we only need output streams, but older compilers did not provide -// them in a separate include file -#ifdef HAVE_STD_OSTREAM_HEADER -# include -#else -# include -#endif +#include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/include/deal.II/base/table_handler.h b/deal.II/include/deal.II/base/table_handler.h index 8200af5b22..c8d8cbca6c 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 #include -// we only need output streams, but older compilers did not provide -// them in a separate include file -#ifdef HAVE_STD_OSTREAM_HEADER -# include -#else -# include -#endif +#include #include #include 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 #include -// we only need output streams, but older compilers did not provide -// them in a separate include file -#ifdef HAVE_STD_OSTREAM_HEADER -# include -#else -# include -#endif +#include diff --git a/deal.II/include/deal.II/base/tensor_base.h b/deal.II/include/deal.II/base/tensor_base.h index 7c4f7390e3..dfb6bdce76 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 #include +#include 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 -#else -# include -#endif template class Vector; diff --git a/deal.II/include/deal.II/grid/tria_iterator.h b/deal.II/include/deal.II/grid/tria_iterator.h index 0c32918742..4b5065d681 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 -// we only need output streams, but older compilers did not provide -// them in a separate include file -#ifdef HAVE_STD_OSTREAM_HEADER -# include -#else -# include -#endif +#include 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 -// we only need output streams, but older compilers did not provide -// them in a separate include file -#ifdef HAVE_STD_OSTREAM_HEADER -# include -#else -# include -#endif - +#include #include #include #include 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 #include -// we only need output streams, but older compilers did not provide -// them in a separate include file -#ifdef HAVE_STD_OSTREAM_HEADER -# include -#else -# include -#endif - +#include #include #include #include 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 #include #include - -// we only need output streams, but older compilers did not provide -// them in a separate include file -#ifdef HAVE_STD_OSTREAM_HEADER -# include -#else -# include -#endif +#include DEAL_II_NAMESPACE_OPEN