build: use ostream/istream over iostream

bezier.hpp

@@ -20,7 +20,7 @@
 #include "point.hpp"
 #include "region.hpp"
 
-#include <iostream>
+#include <ostream>
 
 namespace util {
     template <size_t S>

colour.hpp

@@ -19,7 +19,7 @@
 
 #include "coord.hpp"
 
-#include <iostream>
+#include <ostream>
 
 namespace util {
     /// An RGBA colour POD type.

fixed.hpp

@@ -20,7 +20,7 @@
 #include "types/bits.hpp"
 
 #include <cstdint>
-#include <iostream>
+#include <ostream>
 
 namespace util {
     template <typename T, unsigned I, unsigned E>

geom/aabb.cpp

@@ -16,6 +16,8 @@
 
 
 #include "./aabb.hpp"
+
+#include "./iostream.hpp"
 #include "../debug.hpp"
 
 using util::geom::AABB;

geom/aabb.hpp

@@ -65,9 +65,6 @@ namespace util { namespace geom {
     typedef AABB<3,float> AABB3f;
     typedef AABB<3,size_t> AABB3u;
     typedef AABB<3,intmax_t> AABB3i;
-
-    template <size_t S, typename T>
-    std::ostream& operator<< (std::ostream&, AABB<S,T>);
 } }
 
 #include "aabb.ipp"

geom/iostream.hpp

@@ -19,9 +19,17 @@
 
 #include "./fwd.hpp"
 
-#include <iostream>
+#include <ostream>
 
 namespace util { namespace geom {
+    template <size_t S, typename T>
+    std::ostream&
+    operator<< (std::ostream&, AABB<S,T>);
+
+    template <size_t S, typename T>
+    std::ostream&
+    operator<< (std::ostream&, ray<S,T>);
+
     template <size_t S, typename T>
     std::ostream&
     operator<< (std::ostream&, sphere<S,T>);

geom/ray.cpp

@@ -14,9 +14,11 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#include "ray.hpp"
+#include "./ray.hpp"
+
+#include "./iostream.hpp"
+#include "./ops.hpp"
 
-#include "ops.hpp"
 #include "../debug.hpp"
 
 using util::geom::ray;

geom/ray.hpp

@@ -23,7 +23,7 @@
 #include "../vector.hpp"
 #include "../point.hpp"
 
-#include <iostream>
+#include <ostream>
 
 namespace util { namespace geom {
     template <size_t S, typename T>
@@ -50,9 +50,6 @@ namespace util { namespace geom {
         vector<S,T> direction;
     };
 
-    template <size_t S, typename T>
-    std::ostream& operator<< (std::ostream&, ray<S,T>);
-
     typedef ray<2,float> ray2f;
     typedef ray<3,float> ray3f;
 } }

json/flat.cpp.rl

@@ -25,6 +25,7 @@
 #include "preprocessor.hpp"
 
 #include <deque>
+#include <iostream>
 
 //-----------------------------------------------------------------------------
 %%{

json/flat.hpp

@@ -18,7 +18,7 @@
 #define __UTIL_JSON_FLAT_HPP
 
 #include <boost/filesystem/path.hpp>
-#include <iostream>
+#include <ostream>
 
 #include "../view.hpp"
 

json/tree.hpp

@@ -23,7 +23,7 @@
 #include "../iterator.hpp"
 #include "../view.hpp"
 
-#include <iostream>
+#include <ostream>
 #include <map>
 #include <memory>
 #include <string>

log.cpp

@@ -24,12 +24,12 @@
 #include "cast.hpp"
 
 #include <array>
-#include <ctime>
 #include <cstring>
+#include <ctime>
+#include <iomanip>
+#include <iostream>
 #include <map>
 #include <string>
-#include <iomanip>
-
 
 ///////////////////////////////////////////////////////////////////////////////
 static

log.hpp

@@ -20,7 +20,7 @@
 #include "./nocopy.hpp"
 #include "./preprocessor.hpp"
 
-#include <iostream>
+#include <ostream>
 #include <string>
 
 // Windows.h or one of its friends defines a macro 'ERROR'. Screw Microsoft.

net/address.hpp

@@ -24,7 +24,7 @@
 	#include "ws2tcpip.h"
 #endif
 
-#include <iostream>
+#include <ostream>
 #include <string>
 
 

range.hpp

@@ -19,7 +19,7 @@
 #define __UTIL_RANGE_HPP
 
 #include <cstdint>
-#include <iostream>
+#include <ostream>
 
 namespace util {
     /**

stats.hpp

@@ -17,7 +17,7 @@
 #ifndef __UTIL_STATS_HPP
 #define __UTIL_STATS_HPP
 
-#include <iostream>
+#include <ostream>
 
 
 namespace util {

stream.hpp

@@ -17,7 +17,7 @@
 #ifndef __UTIL_STREAM_HPP
 #define __UTIL_STREAM_HPP
 
-#include <iostream>
+#include <ostream>
 
 namespace util {
     namespace stream {

tools/json-schema.cpp

@@ -23,9 +23,13 @@
 #include "io.hpp"
 
 #include <boost/filesystem.hpp>
+#include <iostream>
+
 
 namespace fs = boost::filesystem;
 
+
+///////////////////////////////////////////////////////////////////////////////
 enum {
     ARG_CMD,
     ARG_SCHEMA,
@@ -35,6 +39,7 @@ enum {
 };
 
 
+///////////////////////////////////////////////////////////////////////////////
 int
 main (int argc, char **argv) {
     if (argc != NUM_ARGS) {

version.hpp

@@ -19,7 +19,7 @@
 
 #include <array>
 #include <string>
-#include <iostream>
+#include <ostream>
 #include <limits>
 
 namespace util {