Use <ostream> over <iostream> if possible.

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

diff --git a/deal.II/base/include/base/data_out_base.h b/deal.II/base/include/base/data_out_base.h
index 772d82905f563fff18b6d7c73ea653c5d2b21b0c..f011e65d46f3a40ad0ca0033ba382750cea3e1d8 100644 (file)
--- a/deal.II/base/include/base/data_out_base.h
+++ b/deal.II/base/include/base/data_out_base.h
@@ -18,10 +18,18 @@
 #include <base/point.h>
 #include <base/vector2d.h>
 #include <grid/geometry_info.h>
-#include <iostream>
 #include <vector>
 #include <string>
 
+// 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
+
+
 class ParameterHandler;
 
 

diff --git a/deal.II/base/include/base/exceptions.h b/deal.II/base/include/base/exceptions.h
index 24b099fcfd07f39e7c42a7e279a1f830ff075138..66e7115fe2d9916dfe349a2a6991c1d5b4797c41 100644 (file)
--- a/deal.II/base/include/base/exceptions.h
+++ b/deal.II/base/include/base/exceptions.h
@@ -17,7 +17,14 @@
 #include <base/config.h>
 
 #include <exception>
-#include <iostream>
+
+// 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
 
 
 #ifndef __GNUC__

diff --git a/deal.II/base/include/base/logstream.h b/deal.II/base/include/base/logstream.h
index a3a29e1de28d9a907c4c62e51084112c0c503630..64b46456482e702d567d56d15af426bf4f22fa48 100644 (file)
--- a/deal.II/base/include/base/logstream.h
+++ b/deal.II/base/include/base/logstream.h
@@ -19,7 +19,14 @@
 
 #include <string>
 #include <stack>
-#include <iostream>
+
+// 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
 
 
 /**

diff --git a/deal.II/base/include/base/parameter_handler.h b/deal.II/base/include/base/parameter_handler.h
index 49bb137d2bc732a3fb8e09dc62a124eedd1cb8b5..fc255262e79cd067ea3e2f3c557da9d59fb79984 100644 (file)
--- a/deal.II/base/include/base/parameter_handler.h
+++ b/deal.II/base/include/base/parameter_handler.h
@@ -15,10 +15,11 @@
 
 
 #include <base/config.h>
+#include <base/exceptions.h>
+
 #include <map>
 #include <vector>
 #include <string>
-#include <base/exceptions.h>
 
 
 // public classes; to be declared below

diff --git a/deal.II/base/include/base/table_handler.h b/deal.II/base/include/base/table_handler.h
index 3be34c2c48975a69a37bc4e3f9c66f3b7cb7c96b..9ef7e5867059026c142b0a70760fb6a03c105ae8 100644 (file)
--- a/deal.II/base/include/base/table_handler.h
+++ b/deal.II/base/include/base/table_handler.h
@@ -20,10 +20,17 @@
 #include <map>
 #include <vector>
 #include <string>
-#include <iostream>
-
 #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
+
+
 
 /**
  * Abstract base class for the @p{TableEntry} class. See there.