2 files changed, 33 insertions, 81 deletions

diff --git a/include/winapi/process.hpp b/include/winapi/process.hpp
index 5f841a0..d52ad0a 100644
--- a/include/winapi/process.hpp
+++ b/include/winapi/process.hpp
@@ -7,8 +7,8 @@
 
 #include "cmd_line.hpp"
 #include "handle.hpp"
+#include "process_io.hpp"
 #include "resource.hpp"
-#include "stream.hpp"
 
 #include <boost/config.hpp>
 
@@ -21,36 +21,8 @@ namespace winapi {
 
 class Process {
 public:
-    struct IO {
-        IO() = default;
-
-        void close();
-
-        process::Stdin std_in;
-        process::Stdout std_out;
-        process::Stderr std_err;
-
-        // VS 2013 won't generate these automatically.
-
-        IO(IO&& other) BOOST_NOEXCEPT_OR_NOTHROW { swap(other); }
-
-        IO& operator=(IO other) BOOST_NOEXCEPT_OR_NOTHROW {
-            swap(other);
-            return *this;
-        }
-
-        void swap(IO& other) BOOST_NOEXCEPT_OR_NOTHROW {
-            using std::swap;
-            swap(std_in, other.std_in);
-            swap(std_out, other.std_out);
-            swap(std_err, other.std_err);
-        }
-
-        IO(const IO&) = delete;
-    };
-
     static Process create(const CommandLine&);
-    static Process create(const CommandLine&, IO);
+    static Process create(const CommandLine&, process::IO);
 
     void wait() const;
 
@@ -69,17 +41,4 @@ private:
     Handle m_handle;
 };
 
-inline void swap(Process::IO& a, Process::IO& b) BOOST_NOEXCEPT_OR_NOTHROW {
-    a.swap(b);
-}
-
 } // namespace winapi
-
-namespace std {
-
-template <>
-inline void swap(winapi::Process::IO& a, winapi::Process::IO& b) BOOST_NOEXCEPT_OR_NOTHROW {
-    a.swap(b);
-}
-
-} // namespace std
diff --git a/include/winapi/stream.hpp b/include/winapi/process_io.hpp
index ed5b40c..597cc08 100644
--- a/include/winapi/stream.hpp
+++ b/include/winapi/process_io.hpp
@@ -23,25 +23,13 @@ struct Stream {
     Handle handle;
 
     // VS 2013 won't generate these automatically.
-
-    Stream(Stream&& other) BOOST_NOEXCEPT_OR_NOTHROW { swap(other); }
-
-    Stream& operator=(Stream other) BOOST_NOEXCEPT_OR_NOTHROW {
-        swap(other);
-        return *this;
-    }
-
-    void swap(Stream& other) BOOST_NOEXCEPT_OR_NOTHROW {
-        using std::swap;
-        swap(handle, other.handle);
-    }
-
+    Stream(Stream&& other) BOOST_NOEXCEPT_OR_NOTHROW;
+    Stream& operator=(Stream other) BOOST_NOEXCEPT_OR_NOTHROW;
+    void swap(Stream& other) BOOST_NOEXCEPT_OR_NOTHROW;
     Stream(const Stream&) = delete;
 };
 
-inline void swap(Stream& a, Stream& b) BOOST_NOEXCEPT_OR_NOTHROW {
-    a.swap(b);
-}
+void swap(Stream& a, Stream& b) BOOST_NOEXCEPT_OR_NOTHROW;
 
 struct Stdin : Stream {
     Stdin();
@@ -50,14 +38,8 @@ struct Stdin : Stream {
     explicit Stdin(Pipe&);
 
     // VS 2013 won't generate these automatically.
-
-    Stdin(Stdin&& other) BOOST_NOEXCEPT_OR_NOTHROW : Stream{std::move(other)} {}
-
-    Stdin& operator=(Stdin other) BOOST_NOEXCEPT_OR_NOTHROW {
-        Stream::operator=(std::move(other));
-        return *this;
-    }
-
+    Stdin(Stdin&& other) BOOST_NOEXCEPT_OR_NOTHROW;
+    Stdin& operator=(Stdin other) BOOST_NOEXCEPT_OR_NOTHROW;
     Stdin(const Stdin&) = delete;
 };
 
@@ -68,14 +50,8 @@ struct Stdout : Stream {
     explicit Stdout(Pipe&);
 
     // VS 2013 won't generate these automatically.
-
-    Stdout(Stdout&& other) BOOST_NOEXCEPT_OR_NOTHROW : Stream{std::move(other)} {}
-
-    Stdout& operator=(Stdout other) BOOST_NOEXCEPT_OR_NOTHROW {
-        Stream::operator=(std::move(other));
-        return *this;
-    }
-
+    Stdout(Stdout&& other) BOOST_NOEXCEPT_OR_NOTHROW;
+    Stdout& operator=(Stdout other) BOOST_NOEXCEPT_OR_NOTHROW;
     Stdout(const Stdout&) = delete;
 };
 
@@ -86,17 +62,29 @@ struct Stderr : Stream {
     explicit Stderr(Pipe&);
 
     // VS 2013 won't generate these automatically.
+    Stderr(Stderr&& other) BOOST_NOEXCEPT_OR_NOTHROW;
+    Stderr& operator=(Stderr other) BOOST_NOEXCEPT_OR_NOTHROW;
+    Stderr(const Stderr&) = delete;
+};
 
-    Stderr(Stderr&& other) BOOST_NOEXCEPT_OR_NOTHROW : Stream{std::move(other)} {}
+struct IO {
+    IO() = default;
 
-    Stderr& operator=(Stderr other) BOOST_NOEXCEPT_OR_NOTHROW {
-        Stream::operator=(std::move(other));
-        return *this;
-    }
+    void close();
 
-    Stderr(const Stderr&) = delete;
+    process::Stdin std_in;
+    process::Stdout std_out;
+    process::Stderr std_err;
+
+    // VS 2013 won't generate these automatically.
+    IO(IO&& other) BOOST_NOEXCEPT_OR_NOTHROW;
+    IO& operator=(IO other) BOOST_NOEXCEPT_OR_NOTHROW;
+    void swap(IO& other) BOOST_NOEXCEPT_OR_NOTHROW;
+    IO(const IO&) = delete;
 };
 
+void swap(IO& a, IO& b) BOOST_NOEXCEPT_OR_NOTHROW;
+
 } // namespace process
 } // namespace winapi
 
@@ -107,4 +95,9 @@ inline void swap(winapi::process::Stream& a, winapi::process::Stream& b) BOOST_N
     a.swap(b);
 }
 
+template <>
+inline void swap(winapi::process::IO& a, winapi::process::IO& b) BOOST_NOEXCEPT_OR_NOTHROW {
+    a.swap(b);
+}
+
 } // namespace std