- move iostream from header to source files.

- replace some iostreams to o/istreams only - some minor include fixes closes #2489 git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1278 fdac6126-5c0c-442c-9429-916003d36597
2015-06-09 08:58:41 +00:00
parent 23fb3781d4
commit ed3155284c
36 changed files with 85 additions and 49 deletions
--- a/src/OpenMesh/Core/IO/BinaryHelper.cc
+++ b/src/OpenMesh/Core/IO/BinaryHelper.cc
@@ -60,6 +60,7 @@
 #include <OpenMesh/Core/System/config.h>
 // -------------------- STL
 #include <algorithm>
+#include <iostream>
 // -------------------- OpenMesh
 #include <OpenMesh/Core/IO/BinaryHelper.hh>

--- a/src/OpenMesh/Core/IO/BinaryHelper.hh
+++ b/src/OpenMesh/Core/IO/BinaryHelper.hh
@@ -66,7 +66,7 @@
 #else
 #  include <cstdio>
 #endif
-#include <iostream>
+#include <iosfwd>
 // -------------------- OpenMesh


--- a/src/OpenMesh/Core/IO/IOManager.cc
+++ b/src/OpenMesh/Core/IO/IOManager.cc
@@ -60,6 +60,8 @@
 #include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/IO/IOManager.hh>

+#include <iostream>
+

 //== NAMESPACES ===============================================================

--- a/src/OpenMesh/Core/IO/IOManager.hh
+++ b/src/OpenMesh/Core/IO/IOManager.hh
@@ -60,7 +60,7 @@


 // STL
-#include <iostream>
+#include <iosfwd>
 #include <sstream>
 #include <string>
 #include <set>
--- a/src/OpenMesh/Core/IO/reader/BaseReader.cc
+++ b/src/OpenMesh/Core/IO/reader/BaseReader.cc
@@ -53,7 +53,6 @@
 #include <OpenMesh/Core/IO/reader/BaseReader.hh>
 #include <algorithm>
 #include <string>
-#include <iterator>
 #if defined(OM_CC_MIPS)
 #  include <ctype.h>
 #else
--- a/src/OpenMesh/Core/IO/reader/BaseReader.hh
+++ b/src/OpenMesh/Core/IO/reader/BaseReader.hh
@@ -62,10 +62,11 @@


 // STD C++
-#include <iostream>
+#include <iosfwd>
 #include <string>
 #include <cctype>
 #include <functional>
+#include <algorithm>

 // OpenMesh
 #include <OpenMesh/Core/System/config.h>
--- a/src/OpenMesh/Core/IO/reader/OBJReader.cc
+++ b/src/OpenMesh/Core/IO/reader/OBJReader.cc
@@ -71,7 +71,9 @@ using std::isspace;
 #include <string.h>
 #endif

-#include <set>
+#include <istream>
+#include <fstream>
+#include <vector>
 #include <algorithm>
 #include <functional>

--- a/src/OpenMesh/Core/IO/reader/OBJReader.hh
+++ b/src/OpenMesh/Core/IO/reader/OBJReader.hh
@@ -61,11 +61,9 @@
 //=== INCLUDES ================================================================


-#include <iostream>
+#include <iosfwd>
 #include <string>
-#include <vector>
 #include <map>
-#include <fstream>

 #include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/Utils/SingletonT.hh>
--- a/src/OpenMesh/Core/IO/reader/OFFReader.cc
+++ b/src/OpenMesh/Core/IO/reader/OFFReader.cc
@@ -65,7 +65,6 @@

 //STL
 #include <iostream>
-#include <ios>
 #include <fstream>
 #include <memory>

--- a/src/OpenMesh/Core/IO/reader/OFFReader.hh
+++ b/src/OpenMesh/Core/IO/reader/OFFReader.hh
@@ -61,10 +61,9 @@
 //=== INCLUDES ================================================================


-#include <iostream>
+#include <iosfwd>
 #include <string>
-#include <stdio.h>
-#include <fstream>
+#include <cstdio>

 #include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/Utils/SingletonT.hh>
--- a/src/OpenMesh/Core/IO/reader/OMReader.cc
+++ b/src/OpenMesh/Core/IO/reader/OMReader.cc
@@ -51,6 +51,8 @@


 //STL
+#include <vector>
+#include <istream>
 #include <fstream>

 // OpenMesh
--- a/src/OpenMesh/Core/IO/reader/OMReader.hh
+++ b/src/OpenMesh/Core/IO/reader/OMReader.hh
@@ -69,7 +69,7 @@
 #include <OpenMesh/Core/IO/reader/BaseReader.hh>

 // STD C++
-#include <iostream>
+#include <iosfwd>
 #include <string>


--- a/src/OpenMesh/Core/IO/reader/PLYReader.cc
+++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc
@@ -61,6 +61,7 @@

 //STL
 #include <fstream>
+#include <iostream>
 #include <memory>

 #ifndef WIN32
--- a/src/OpenMesh/Core/IO/reader/PLYReader.hh
+++ b/src/OpenMesh/Core/IO/reader/PLYReader.hh
@@ -61,10 +61,10 @@
 //=== INCLUDES ================================================================


-#include <iostream>
+
+#include <iosfwd>
 #include <string>
-#include <stdio.h>
-#include <fstream>
+#include <cstdio>
 #include <vector>

 #include <OpenMesh/Core/System/config.h>
--- a/src/OpenMesh/Core/IO/writer/BaseWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/BaseWriter.cc
@@ -54,7 +54,6 @@
 #include <OpenMesh/Core/IO/writer/BaseWriter.hh>
 #include <algorithm>
 #include <string>
-#include <iterator>
 #if defined(OM_CC_MIPS)
 #  include <ctype.h>
 #else
--- a/src/OpenMesh/Core/IO/writer/BaseWriter.hh
+++ b/src/OpenMesh/Core/IO/writer/BaseWriter.hh
@@ -62,7 +62,7 @@


 // STD C++
-#include <iostream>
+#include <iosfwd>
 #include <string>

 // OpenMesh
--- a/src/OpenMesh/Core/IO/writer/OMWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/OMWriter.cc
@@ -60,6 +60,9 @@
 #endif

 #include <fstream>
+#include <ostream>
+#include <vector>
+
 // -------------------- OpenMesh
 #include <OpenMesh/Core/IO/OMFormat.hh>
 #include <OpenMesh/Core/System/omstream.hh>
--- a/src/OpenMesh/Core/IO/writer/OMWriter.hh
+++ b/src/OpenMesh/Core/IO/writer/OMWriter.hh
@@ -62,7 +62,7 @@


 // STD C++
-#include <iostream>
+#include <iosfwd>
 #include <string>

 // OpenMesh
--- a/src/OpenMesh/Core/IO/writer/PLYWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/PLYWriter.cc
@@ -59,6 +59,8 @@

 #include <OpenMesh/Core/IO/SR_store.hh>

+#include <iostream>
+
 //=== NAMESPACES ==============================================================