Use iosfwd instead of ostream where possible

tautschnig · tautschnig · commit 9c03ca3fd34b · 2018-04-26T19:53:47.000Z
diff --git a/src/analyses/goto_rw.h b/src/analyses/goto_rw.h
@@ -13,7 +13,7 @@ Date: April 2010
 #define CPROVER_ANALYSES_GOTO_RW_H
 
 #include <map>
-#include <ostream>
+#include <iosfwd>
 #include <limits>
 #include <memory> // unique_ptr
 
diff --git a/src/cbmc/symex_coverage.h b/src/cbmc/symex_coverage.h
@@ -15,7 +15,7 @@ Date: March 2016
 #define CPROVER_CBMC_SYMEX_COVERAGE_H
 
 #include <string>
-#include <ostream>
+#include <iosfwd>
 #include <map>
 
 #include <goto-programs/goto_program.h>
diff --git a/src/goto-analyzer/static_show_domain.h b/src/goto-analyzer/static_show_domain.h
@@ -9,7 +9,7 @@ Author: Martin Brain, martin.brain@cs.ox.ac.uk
 #ifndef CPROVER_GOTO_ANALYZER_STATIC_SHOW_DOMAIN_H
 #define CPROVER_GOTO_ANALYZER_STATIC_SHOW_DOMAIN_H
 
-#include <ostream>
+#include <iosfwd>
 
 #include <util/message.h>
 #include <util/options.h>
diff --git a/src/goto-analyzer/static_simplifier.h b/src/goto-analyzer/static_simplifier.h
@@ -9,7 +9,7 @@ Author: Martin Brain, martin.brain@cs.ox.ac.uk
 #ifndef CPROVER_GOTO_ANALYZER_STATIC_SIMPLIFIER_H
 #define CPROVER_GOTO_ANALYZER_STATIC_SIMPLIFIER_H
 
-#include <ostream>
+#include <iosfwd>
 
 #include <util/message.h>
 #include <util/options.h>
diff --git a/src/goto-analyzer/static_verifier.h b/src/goto-analyzer/static_verifier.h
@@ -9,7 +9,7 @@ Author: Martin Brain, martin.brain@cs.ox.ac.uk
 #ifndef CPROVER_GOTO_ANALYZER_STATIC_VERIFIER_H
 #define CPROVER_GOTO_ANALYZER_STATIC_VERIFIER_H
 
-#include <ostream>
+#include <iosfwd>
 
 #include <util/message.h>
 #include <util/options.h>
diff --git a/src/goto-instrument/object_id.h b/src/goto-instrument/object_id.h
@@ -13,7 +13,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #define CPROVER_GOTO_INSTRUMENT_OBJECT_ID_H
 
 #include <set>
-#include <ostream>
+#include <iosfwd>
 
 #include <util/std_expr.h>
 #include <util/std_code.h>
diff --git a/src/jsil/jsil_parse_tree.cpp b/src/jsil/jsil_parse_tree.cpp
@@ -11,6 +11,8 @@ Author: Michael Tautschnig, tautschn@amazon.com
 
 #include "jsil_parse_tree.h"
 
+#include <ostream>
+
 #include <util/symbol.h>
 
 #include "jsil_types.h"
diff --git a/src/jsil/jsil_parse_tree.h b/src/jsil/jsil_parse_tree.h
@@ -12,7 +12,7 @@ Author: Michael Tautschnig, tautschn@amazon.com
 #ifndef CPROVER_JSIL_JSIL_PARSE_TREE_H
 #define CPROVER_JSIL_JSIL_PARSE_TREE_H
 
-#include <ostream>
+#include <iosfwd>
 #include <list>
 
 #include <util/std_expr.h>
diff --git a/src/util/graph.h b/src/util/graph.h
@@ -16,7 +16,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <stack>
 #include <map>
 #include <vector>
-#include <ostream>
+#include <iosfwd>
 #include <cassert>
 #include <algorithm>
 #include <queue>
diff --git a/src/util/json_stream.h b/src/util/json_stream.h
@@ -10,7 +10,7 @@ Author: Peter Schrammel
 #define CPROVER_UTIL_JSON_STREAM_H
 
 #include <memory>
-#include <ostream>
+#include <iosfwd>
 
 #include "json.h"
 #include "invariant.h"
diff --git a/src/util/string_utils.h b/src/util/string_utils.h
@@ -10,7 +10,7 @@ Author: Daniel Poetzl
 #ifndef CPROVER_UTIL_STRING_UTILS_H
 #define CPROVER_UTIL_STRING_UTILS_H
 
-#include <ostream>
+#include <iosfwd>
 #include <string>
 #include <vector>
 
diff --git a/src/xmllang/graphml.h b/src/xmllang/graphml.h
@@ -12,8 +12,7 @@ Author: Michael Tautschnig, mt@eecs.qmul.ac.uk
 #ifndef CPROVER_XMLLANG_GRAPHML_H
 #define CPROVER_XMLLANG_GRAPHML_H
 
-#include <istream>
-#include <ostream>
+#include <iosfwd>
 #include <string>
 
 #include <util/irep.h>
