Use <ostream> over <iostream> when that is available.

git-svn-id: https://svn.dealii.org/trunk@5419 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/include/grid/tria_iterator.h b/deal.II/deal.II/include/grid/tria_iterator.h
index 4b53afb886668a13736e585fb00aa472cc11ff38..1bceacd45e173f4c06652b1e712e2c74316daae3 100644 (file)
--- a/deal.II/deal.II/include/grid/tria_iterator.h
+++ b/deal.II/deal.II/include/grid/tria_iterator.h
@@ -17,14 +17,21 @@
 /*----------------------------   tria-iterator.h     ---------------------------*/
 
 
-//TODO:[WB] (compiler) Change <iostream> to <ostream> when that becomes available
 #include <base/config.h>
-#include <iterator>
-#include <iostream>
 #include <base/exceptions.h>
 #include <base/point.h>
 #include <grid/tria_iterator_base.h>
 
+#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
+
 template <int dim> class Triangulation;
 
 // note: in non-debug mode, i.e. with optimizations, the file

diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/deal.II/source/dofs/dof_constraints.cc
index e265db47141e65bf9b12e71c02f22a90cb253bb4..2f69f6d93bbe79e2e2ce0b24aebde906a0875389 100644 (file)
--- a/deal.II/deal.II/source/dofs/dof_constraints.cc
+++ b/deal.II/deal.II/source/dofs/dof_constraints.cc
@@ -22,11 +22,18 @@
 #include <lac/block_vector.h>
 #include <lac/sparse_matrix.h>
 #include <lac/block_sparse_matrix.h>
-#include <iostream>
+
 #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
 
 
 inline

diff --git a/deal.II/doc/news/2001/c-3-2.html b/deal.II/doc/news/2001/c-3-2.html
index 89974be9d39438666b46c5e03363b42061b16886..12ef8af4649b400516b6f15c7be0220804b2e402 100644 (file)
--- a/deal.II/doc/news/2001/c-3-2.html
+++ b/deal.II/doc/news/2001/c-3-2.html
@@ -26,6 +26,14 @@ documentation, etc</a>.
 <h3>General</h3>
 
 <ol>
+  <li> <p> New: configuration detects whether the compiler has the
+       include file <code>&lt;ostream&gt;</code>. Most files in the
+       library then include this file over
+       <code>&lt;iostream&gt;</code> to save compile time.
+       <br>
+       (WB 2002/01/25)
+       </p>
+
   <li> <p> Fixed: All example and test programs as well as a number of
        large applications have been checked against the memory checker
        "purify". Only three memory leaks were found and fixed. We