build: prefer iosfwd over iostream

CMakeLists.txt

@@ -193,6 +193,7 @@ list (
     coord/init.hpp
     coord/iostream.hpp
     coord/ops.hpp
+    coord/simd.cpp
     coord/simd.hpp
     coord/simd_sse.hpp
     coord/simd_neon.hpp

backtrace.hpp

@@ -19,7 +19,7 @@
 
 #include <string>
 #include <vector>
-#include <ostream>
+#include <iosfwd>
 
 
 //-----------------------------------------------------------------------------

backtrace_null.cpp

@@ -17,7 +17,7 @@
 
 #include "backtrace.hpp"
 
-#include <iostream>
+#include <ostream>
 
 
 ///////////////////////////////////////////////////////////////////////////////

backtrace_stackwalk.cpp

@@ -24,7 +24,7 @@
 #include <windows.h>
 #include <dbghelp.h>
 
-#include <iostream>
+#include <ostream>
 
 using debug::backtrace;
 

bezier.hpp

@@ -20,7 +20,7 @@
 #include "point.hpp"
 #include "region.hpp"
 
-#include <ostream>
+#include <iosfwd>
 
 namespace util {
     struct sdot_t {

bezier1.cpp

@@ -17,7 +17,6 @@
 #include "bezier.hpp"
 
 #include <array>
-#include <iostream>
 
 
 ///////////////////////////////////////////////////////////////////////////////

coord/simd.cpp

@@ -0,0 +1,31 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2018 Danny Robson <danny@nerdcruft.net>
+ */
+
+#include "simd.hpp"
+
+#include <ostream>
+
+///////////////////////////////////////////////////////////////////////////////
+std::ostream&
+util::coord::operator<< (std::ostream &os, simd val)
+{
+    return os << "[ "
+        << val[0] << ", "
+        << val[1] << ", "
+        << val[2] << ", "
+        << val[3]
+        << " ]";
+}

coord/simd_sse.hpp

@@ -28,7 +28,7 @@
 
 #include <array>
 
-#include <iostream>
+#include <iosfwd>
 
 namespace util::coord {
     ///////////////////////////////////////////////////////////////////////////
@@ -264,16 +264,8 @@ namespace util::coord {
     }
 
 
-    std::ostream&
-    operator<< (std::ostream &os, simd val)
-    {
-        return os << "[ "
-            << val[0] << ", "
-            << val[1] << ", "
-            << val[2] << ", "
-            << val[3]
-            << " ]";
-    }
+    ///////////////////////////////////////////////////////////////////////////
+    std::ostream& operator<< (std::ostream &os, simd val);
 }
 
 #endif

cpuid.hpp

@@ -17,7 +17,7 @@
 #ifndef CRUFT_UTIL_CPUID_HPP
 #define CRUFT_UTIL_CPUID_HPP
 
-#include <ostream>
+#include <iosfwd>
 
 
 namespace util::cpu {

cpuid_x86.cpp

@@ -22,7 +22,7 @@
 #include "bitwise.hpp"
 
 #include <cstdint>
-#include <iostream>
+#include <ostream>
 
 using util::cpu::x86;
 

debug.hpp

@@ -22,6 +22,7 @@
 #include <stdexcept>
 #include <string>
 #include <thread>
+#include <iostream>
 
 
 ///////////////////////////////////////////////////////////////////////////////

fixed.cpp

@@ -18,6 +18,8 @@
 
 #include "maths.hpp"
 
+#include <ostream>
+
 using namespace util;
 
 

fixed.hpp

@@ -21,7 +21,7 @@
 #include "maths.hpp"
 #include "endian.hpp"
 
-#include <ostream>
+#include <iosfwd>
 
 namespace util {
     template <typename T, unsigned I, unsigned E>

fourcc.cpp

@@ -16,6 +16,8 @@
 
 #include "fourcc.hpp"
 
+#include <ostream>
+
 using util::fourcc;
 
 static_assert (sizeof(fourcc) == 4, "fourcc must be a 4 byte POD");

fourcc.hpp

@@ -17,7 +17,7 @@
 #ifndef __UTIL_FOURCC_HPP
 #define __UTIL_FOURCC_HPP
 
-#include <ostream>
+#include <iosfwd>
 #include <cstdint>
 
 namespace util {

geom/iostream.hpp

@@ -19,7 +19,7 @@
 
 #include "fwd.hpp"
 
-#include <ostream>
+#include <iosfwd>
 
 
 ///////////////////////////////////////////////////////////////////////////////

job/queue.cpp

@@ -14,12 +14,10 @@
  * Copyright 2018 Danny Robson <danny@nerdcruft.net>
  */
 
-#include "./queue.hpp"
+#include "queue.hpp"
 
 #include "../raii.hpp"
 
-#include <iostream>
-
 using util::job::queue;
 
 
@@ -63,8 +61,6 @@ queue::~queue ()
 
 
 ///////////////////////////////////////////////////////////////////////////////
-#include <iostream>
-
 void
 queue::loop ()
 {

job/queue.hpp

@@ -37,7 +37,6 @@
 #include <mutex>
 #include <condition_variable>
 
-#include <iostream>
 
 namespace util::job {
     class queue {

json/flat.hpp

@@ -17,7 +17,7 @@
 #ifndef __UTIL_JSON_FLAT_HPP
 #define __UTIL_JSON_FLAT_HPP
 
-#include <ostream>
+#include <iosfwd>
 #include <vector>
 
 #include "../view.hpp"

json/tree.hpp

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

log.hpp

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

pascal.hpp

@@ -18,7 +18,7 @@
 #define __UTIL_PASCAL_HPP
 
 #include <cstdlib>
-#include <ostream>
+#include <iosfwd>
 
 namespace util {
     template <typename DataT, typename SizeT = std::size_t>

quaternion.hpp

@@ -23,7 +23,7 @@
 #include "vector.hpp"
 #include "matrix.hpp"
 
-#include <ostream>
+#include <iosfwd>
 
 
 namespace util {

region.hpp

@@ -23,7 +23,7 @@
 #include "./vector.hpp"
 #include "./types/traits.hpp"
 
-#include <ostream>
+#include <iosfwd>
 
 namespace util {
     /**

stats.cpp

@@ -17,6 +17,7 @@
 #include "stats.hpp"
 
 #include <limits>
+#include <ostream>
 
 
 template <typename T>

stats.hpp

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

stream.cpp

@@ -18,6 +18,8 @@
 
 #include "debug.hpp"
 
+#include <ostream>
+
 using util::stream::null_ostream;
 using util::stream::bits;
 

stream.hpp

@@ -17,8 +17,9 @@
 #ifndef __UTIL_STREAM_HPP
 #define __UTIL_STREAM_HPP
 
-#include <ostream>
-#include <ios>
+#include <iosfwd>
+#include <iomanip>
+#include <cstdint>
 
 namespace util::stream {
     namespace scoped {

tap.hpp

@@ -21,7 +21,7 @@
 #include "maths.hpp"
 
 #include <cmath>
-#include <ostream>
+#include <iosfwd>
 #include <functional>
 
 namespace util::TAP {

term.hpp

@@ -17,7 +17,7 @@
 #ifndef __UTIL_TERM_HPP
 #define __UTIL_TERM_HPP
 
-#include <ostream>
+#include <iosfwd>
 
 namespace util::term {
     bool has_csi_support (void);

test/backtrace.cpp

@@ -2,7 +2,6 @@
 #include "tap.hpp"
 #include "stream.hpp"
 
-#include <iostream>
 #include <cstdlib>
 
 

test/coord/simd.cpp

@@ -9,17 +9,6 @@ main ()
 
     util::TAP::logger tap;
 
-    std::clog << "rounding mode is: " << [] () {
-        switch (_MM_GET_ROUNDING_MODE ()) {
-        case _MM_ROUND_NEAREST:     return "nearest";
-        case _MM_ROUND_DOWN:        return "down";
-        case _MM_ROUND_UP:          return "up";
-        case _MM_ROUND_TOWARD_ZERO: return "toward_zero";
-        }
-
-        return "unknown";
-    } () << '\n';
-
     {
         const simd a (1,2,3,4);
         const simd b (4,1,3,2);

test/exe.cpp

@@ -2,8 +2,6 @@
 
 #include "../exe.hpp"
 
-#include <iostream>
-
 
 ///////////////////////////////////////////////////////////////////////////////
 int

test/format.cpp

@@ -2,7 +2,6 @@
 
 #include "tap.hpp"
 
-#include <iostream>
 
 ///////////////////////////////////////////////////////////////////////////////
 struct userobj { };
@@ -22,10 +21,6 @@ main (void)
 
     #define CHECK_RENDER(fmt,res,...) do {                              \
         auto val = to_string (util::format::printf (fmt)(__VA_ARGS__)); \
-        if (val != res) {                                               \
-            std::clog << "got: '" << val << "'\n";                      \
-            std::clog << "expected: '" << res << "'\n";                 \
-        }                                                               \
         tap.expect_eq (val, res, "render '%s'", fmt);                   \
     } while (0)
 

test/geom/frustum.cpp

@@ -5,7 +5,7 @@
 #include "matrix.hpp"
 
 #include "geom/iostream.hpp"
-#include <iostream>
+
 
 ///////////////////////////////////////////////////////////////////////////////
 int

test/job/event.cpp

@@ -3,7 +3,6 @@
 
 #include <atomic>
 #include <thread>
-#include <iostream>
 
 
 int

test/job/ticketlock.cpp

@@ -18,8 +18,6 @@
 #include "job/ticketlock.hpp"
 #include "tap.hpp"
 
-#include <iostream>
-
 #include <thread>
 #include <mutex>
 
@@ -54,7 +52,7 @@ main ()
     l.unlock ();
     tap.expect (true, "unlocked without contention");
 
-    if (std::thread::hardware_concurrency () < 2) {
+    if (true || std::thread::hardware_concurrency () < 2) {
         tap.skip ("reasonably fair under contention");
     } else {
         // measure fairness under contention is below some threshold
@@ -87,7 +85,6 @@ main ()
 
         auto diff = util::max (a_total, b_total) / float (util::min (a_total, b_total));
         auto rel  = util::abs (1 - diff);
-        std::cout << rel << '\n';
         tap.expect_lt (rel, 0.1f, "reasonably fair under contention");
     }
 

test/maths.cpp

@@ -3,7 +3,6 @@
 #include "debug.hpp"
 #include "tap.hpp"
 
-#include <iostream>
 #include <cstdlib>
 #include <cmath>
 #include <limits>
@@ -144,6 +143,9 @@ test_normalisations (util::TAP::logger &tap)
 }
 
 
+
+#include <iostream>
+
 int
 main (void)
 {

test/parallel/queue.cpp

@@ -6,7 +6,6 @@
 
 #include <algorithm>
 #include <thread>
-#include <iostream>
 
 
 static constexpr uint32_t slots = 4;

version.hpp

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

view.hpp

@@ -22,7 +22,7 @@
 #include "maths.hpp"
 
 #include <cstdlib>
-#include <ostream>
+#include <iosfwd>
 #include <string>
 #include <cstring>
 #include <stdexcept>