Merge pull request #3084 from akva2/cleanup_stream_includes

clean up stream includes
2022-07-27 17:08:28 +02:00 · 2022-07-27 17:08:28 +02:00 · 92ebef3bc9
commit 92ebef3bc9
parent 5532176af4 068bff1ebc
22 changed files with 18 additions and 19 deletions
--- a/examples/wellgraph.cpp
+++ b/examples/wellgraph.cpp
@ -20,6 +20,7 @@
 #include <filesystem>
 #include <fstream>
 #include <iomanip>
+#include <iostream>
 #include <chrono>
 #include <sstream>

--- a/opm/common/OpmLog/StreamLog.hpp
+++ b/opm/common/OpmLog/StreamLog.hpp
@ -21,7 +21,6 @@
 #define STREAMLOG_H

 #include <fstream>
-#include <iostream>
 #include <cstdint>

 #include <opm/common/OpmLog/LogBackend.hpp>
--- a/opm/common/utility/numeric/UniformTableLinear.hpp
+++ b/opm/common/utility/numeric/UniformTableLinear.hpp
@ -24,7 +24,7 @@
 #include <exception>
 #include <vector>
 #include <utility>
-#include <iostream>
+#include <ostream>

 #include <opm/common/ErrorMacros.hpp>

--- a/opm/input/eclipse/Deck/Deck.hpp
+++ b/opm/input/eclipse/Deck/Deck.hpp
@ -21,9 +21,9 @@
 #define DECK_HPP

 #include <functional>
+#include <iosfwd>
 #include <map>
 #include <memory>
-#include <ostream>
 #include <optional>
 #include <vector>
 #include <string>
--- a/opm/input/eclipse/Deck/DeckItem.hpp
+++ b/opm/input/eclipse/Deck/DeckItem.hpp
@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include <ostream>
+#include <iosfwd>

 #include <opm/input/eclipse/Units/Dimension.hpp>
 #include <opm/input/eclipse/Utility/Typetools.hpp>
--- a/opm/input/eclipse/Deck/DeckOutput.hpp
+++ b/opm/input/eclipse/Deck/DeckOutput.hpp
@ -20,7 +20,7 @@
 #ifndef DECK_OUTPUT_HPP
 #define DECK_OUTPUT_HPP

-#include <ostream>
+#include <iosfwd>
 #include <string>
 #include <cstddef>

--- a/opm/input/eclipse/Deck/DeckRecord.hpp
+++ b/opm/input/eclipse/Deck/DeckRecord.hpp
@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include <ostream>
+#include <iosfwd>

 #include <opm/input/eclipse/Deck/DeckItem.hpp>

--- a/opm/input/eclipse/Deck/FileDeck.hpp
+++ b/opm/input/eclipse/Deck/FileDeck.hpp
@ -25,7 +25,7 @@
 #include <unordered_set>
 #include <filesystem>
 #include <fstream>
-#include <iostream>
+#include <iosfwd>
 #include <fmt/format.h>

 #include <opm/input/eclipse/Deck/DeckKeyword.hpp>
--- a/opm/input/eclipse/Schedule/ScheduleDeck.hpp
+++ b/opm/input/eclipse/Schedule/ScheduleDeck.hpp
@ -22,7 +22,7 @@
 #include <chrono>
 #include <cstddef>
 #include <optional>
-#include <ostream>
+#include <iosfwd>
 #include <vector>

 #include <opm/common/OpmLog/KeywordLocation.hpp>
--- a/opm/io/eclipse/EGrid.hpp
+++ b/opm/io/eclipse/EGrid.hpp
@ -23,11 +23,8 @@

 #include <array>
 #include <filesystem>
-#include <iostream>
 #include <string>
-#include <fstream>
 #include <vector>
-#include <ctime>
 #include <map>

 namespace Opm { namespace EclIO {
--- a/opm/io/eclipse/ESmry.hpp
+++ b/opm/io/eclipse/ESmry.hpp
@ -21,7 +21,7 @@

 #include <chrono>
 #include <filesystem>
-#include <ostream>
+#include <iosfwd>
 #include <string>
 #include <unordered_map>
 #include <vector>
--- a/opm/io/eclipse/EclOutput.hpp
+++ b/opm/io/eclipse/EclOutput.hpp
@ -26,7 +26,6 @@

 #include <opm/io/eclipse/EclIOdata.hpp>
 #include <opm/io/eclipse/PaddedOutputString.hpp>
-#include <iostream>

 namespace Opm { namespace EclIO { namespace OutputStream {
    class Restart;
--- a/opm/io/eclipse/ExtESmry.hpp
+++ b/opm/io/eclipse/ExtESmry.hpp
@ -21,7 +21,6 @@

 #include <chrono>
 #include <filesystem>
-#include <ostream>
 #include <string>
 #include <unordered_map>
 #include <vector>
--- a/opm/output/eclipse/EclipseIOUtil.hpp
+++ b/opm/output/eclipse/EclipseIOUtil.hpp
@ -2,8 +2,6 @@
 #define ECLIPSE_IO_UTIL_HPP

 #include <vector>
-#include <string>
-#include <iostream>


 namespace Opm
--- a/opm/output/eclipse/WriteRPT.hpp
+++ b/opm/output/eclipse/WriteRPT.hpp
@ -20,7 +20,7 @@
 #ifndef OPM_WRITE_RPT_HPP
 #define OPM_WRITE_RPT_HPP

-#include <ostream>
+#include <iosfwd>

 namespace Opm {

--- a/opm/utility/EModel.hpp
+++ b/opm/utility/EModel.hpp
@ -25,9 +25,7 @@

 #include <opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp>

-#include <iostream>
 #include <string>
-#include <fstream>
 #include <vector>
 #include <ctime>
 #include <map>
--- a/src/opm/input/eclipse/Deck/FileDeck.cpp
+++ b/src/opm/input/eclipse/Deck/FileDeck.cpp
@ -27,6 +27,8 @@
 #include <opm/input/eclipse/Parser/ParserKeywords/S.hpp>
 #include <opm/input/eclipse/Parser/ParserKeywords/T.hpp>

+#include <iostream>
+
 namespace fs = std::filesystem;

 namespace Opm {
--- a/src/opm/input/eclipse/Parser/ParserRecord.cpp
+++ b/src/opm/input/eclipse/Parser/ParserRecord.cpp
@ -30,6 +30,8 @@

 #include "raw/RawRecord.hpp"

+#include <ostream>
+
 namespace Opm {

 namespace {
--- a/src/opm/io/eclipse/EGrid.cpp
+++ b/src/opm/io/eclipse/EGrid.cpp
@ -25,6 +25,7 @@
 #include <algorithm>
 #include <cstring>
 #include <filesystem>
+#include <fstream>
 #include <iterator>
 #include <iomanip>
 #include <numeric>
--- a/src/opm/output/eclipse/WriteRPT.cpp
+++ b/src/opm/output/eclipse/WriteRPT.cpp
@ -20,6 +20,7 @@
 #include <opm/output/eclipse/WriteRPT.hpp>

 #include <functional>
+#include <string>
 #include <unordered_map>

 namespace Opm::RptIO {
--- a/test_util/EclRegressionTest.cpp
+++ b/test_util/EclRegressionTest.cpp
@ -37,6 +37,7 @@
 #include <chrono>
 #include <cmath>
 #include <filesystem>
+#include <fstream>
 #include <iomanip>
 #include <iostream>
 #include <set>
--- a/tests/test_EclipseIO.cpp
+++ b/tests/test_EclipseIO.cpp
@ -47,6 +47,7 @@
 #include <opm/common/utility/TimeService.hpp>

 #include <algorithm>
+#include <fstream>
 #include <map>
 #include <numeric>
 #include <string>