remove '#include <iostream>' from headers and from unneeded places

It's harmful to have iostream everywhere as it injects functions in the compiled files

src/util/approx_nat.h

@@ -19,7 +19,7 @@ Notes:
 --*/
 #pragma once
 
-#include<iostream>
+#include<ostream>
 #include<climits>
 
 class approx_nat {

src/util/approx_set.h

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #pragma once
-#include<iostream>
+#include<ostream>
 #include "util/debug.h"
 
 template<typename T> class approx_set_traits;

src/util/cmd_context_types.cpp

@@ -14,7 +14,6 @@ Author:
 Notes:
 
 --*/
-#include<iostream>
 #include "util/cmd_context_types.h"
 
 std::ostream & operator<<(std::ostream & out, cmd_arg_kind k) {

src/util/cmd_context_types.h

@@ -18,6 +18,7 @@ Notes:
 
 #include "util/symbol.h"
 #include "util/z3_exception.h"
+#include <ostream>
 #include<sstream>
 class rational;
 class expr;

src/util/ext_numeral.h

@@ -19,7 +19,7 @@ Revision History:
 --*/
 #pragma once
 
-#include<iostream>
+#include<ostream>
 #include "util/debug.h"
     
 enum ext_numeral_kind { EN_MINUS_INFINITY, EN_NUMERAL, EN_PLUS_INFINITY };

src/util/permutation.h

@@ -18,7 +18,7 @@ Revision History:
 --*/
 #pragma once
 
-#include<iostream>
+#include<ostream>
 #include "util/vector.h"
 
 class permutation {

src/util/region.h

@@ -18,7 +18,7 @@ Revision History:
 --*/
 #pragma once
 #include<cstdlib>
-#include<iostream>
+#include<ostream>
 
 #ifdef Z3DEBUG
 

src/util/scoped_ctrl_c.cpp

@@ -17,7 +17,6 @@ Revision History:
 
 --*/
 #include<signal.h>
-#include<iostream>
 #include "util/scoped_ctrl_c.h"
 
 static scoped_ctrl_c * g_obj = nullptr;

src/util/statistics.h

@@ -18,7 +18,7 @@ Notes:
 --*/
 #pragma once
 
-#include<iostream>
+#include<ostream>
 #include "util/vector.h"
 #include "util/rlimit.h"
 

src/util/stopwatch.h

@@ -21,7 +21,7 @@ Revision History:
 
 #include "util/debug.h"
 #include <chrono>
-#include <iostream>
+#include <ostream>
 #include<iomanip>
 
 

src/util/stream_buffer.h

@@ -20,7 +20,7 @@ Revision History:
 --*/
 #pragma once
 
-#include<iostream>
+#include<istream>
 
 class stream_buffer {
     std::istream & m_stream;
@@ -40,5 +40,3 @@ public:
         m_val = m_stream.get();
     }
 };
-
-

src/util/timeit.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include<iostream>
 #include "util/timeit.h"
 #include "util/memory_manager.h"
 #include "util/stopwatch.h"
 #include<iomanip>
+#include<iostream>
 
 struct timeit::imp {
     stopwatch      m_watch;
@@ -45,9 +45,9 @@ struct timeit::imp {
     }
 };
 
-timeit::timeit(bool enable, char const * msg, std::ostream & out) {
+timeit::timeit(bool enable, char const * msg, std::ostream * out) {
     if (enable)
-        m_imp = alloc(imp, msg, out);
+        m_imp = alloc(imp, msg, out ? *out : std::cerr);
     else
         m_imp = nullptr;
 }

src/util/timeit.h

@@ -21,11 +21,14 @@ Revision History:
 --*/
 #pragma once
 
+#include<ostream>
+
 class timeit {
     struct imp;
     imp *  m_imp;
 public:
-    timeit(bool enable, char const * msg, std::ostream & out = std::cerr);
+    timeit(bool enable, char const * msg, std::ostream * out = nullptr);
+    timeit(bool enable, char const * msg, std::ostream & out) : timeit(enable, msg, &out) {}
     ~timeit();
 };
 

src/util/util.cpp

@@ -18,7 +18,7 @@ Revision History:
 --*/
 
 #include "util/util.h"
-
+#include <iostream>
 
 static unsigned g_verbosity_level = 0;
 

src/util/util.h

@@ -20,7 +20,7 @@ Revision History:
 
 #include "util/debug.h"
 #include "util/memory_manager.h"
-#include<iostream>
+#include<ostream>
 #include<climits>
 #include<limits>
 #include<stdint.h>

src/util/warning.h

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #pragma once
-#include<iostream>
+#include<ostream>
 #include<stdarg.h>
 
 void send_warnings_to_stdout(bool flag);