Merge remote-tracking branch 'remotes/origin/develop'

Update job_workaround.hpp
Merge pull request #158 from klemens-morgenstern/develop
2026-01-19 16:32:15 +00:00 · 2018-04-05 20:35:52 +02:00 · 2018-04-05 20:12:51 +02:00 · 2018-04-05 11:16:39 +02:00 · 2018-04-05 10:08:00 +02:00 · 2018-04-04 20:55:25 +02:00
3 changed files with 28 additions and 4 deletions
--- a/include/boost/process/detail/posix/async_pipe.hpp
+++ b/include/boost/process/detail/posix/async_pipe.hpp
@@ -125,6 +125,18 @@ public:
        return _sink.write_some(buffers);
    }

+    template<typename MutableBufferSequence>
+    std::size_t read_some(const MutableBufferSequence & buffers, boost::system::error_code & ec) noexcept
+    {
+        return _source.read_some(buffers, ec);
+    }
+    template<typename MutableBufferSequence>
+    std::size_t write_some(const MutableBufferSequence & buffers, boost::system::error_code & ec) noexcept
+    {
+        return _sink.write_some(buffers, ec);
+    }
+
+
    native_handle_type native_source() const {return const_cast<boost::asio::posix::stream_descriptor&>(_source).native_handle();}
    native_handle_type native_sink  () const {return const_cast<boost::asio::posix::stream_descriptor&>(_sink  ).native_handle();}

--- a/include/boost/process/detail/windows/async_pipe.hpp
+++ b/include/boost/process/detail/windows/async_pipe.hpp
@@ -144,6 +144,18 @@ public:
        return _sink.write_some(buffers);
    }

+
+    template<typename MutableBufferSequence>
+    std::size_t read_some(const MutableBufferSequence & buffers, boost::system::error_code & ec) noexcept
+    {
+        return _source.read_some(buffers, ec);
+    }
+    template<typename MutableBufferSequence>
+    std::size_t write_some(const MutableBufferSequence & buffers, boost::system::error_code & ec) noexcept
+    {
+        return _sink.write_some(buffers, ec);
+    }
+
    native_handle_type native_source() const {return const_cast<boost::asio::windows::stream_handle&>(_source).native_handle();}
    native_handle_type native_sink  () const {return const_cast<boost::asio::windows::stream_handle&>(_sink  ).native_handle();}

--- a/include/boost/process/detail/windows/job_workaround.hpp
+++ b/include/boost/process/detail/windows/job_workaround.hpp
@@ -82,7 +82,7 @@ typedef struct _JOBOBJECT_EXTENDED_LIMIT_INFORMATION_ {
  _Out_opt_ LPDWORD            lpReturnLength
 );
 */
-typedef ::boost::winapi::BOOL_  ( WINAPI *query_information_job_object_p)(
+typedef ::boost::winapi::BOOL_  (*query_information_job_object_p)(
        ::boost::winapi::HANDLE_,
        JOBOBJECTINFOCLASS_,
        void *,
@@ -90,7 +90,7 @@ typedef ::boost::winapi::BOOL_  ( WINAPI *query_information_job_object_p)(
        ::boost::winapi::DWORD_ *);


-inline ::boost::winapi::BOOL_ WINAPI query_information_job_object(
+inline ::boost::winapi::BOOL_ query_information_job_object(
        ::boost::winapi::HANDLE_ hJob,
        JOBOBJECTINFOCLASS_ JobObjectInfoClass,
        void * lpJobObjectInfo,
@@ -110,7 +110,7 @@ inline ::boost::winapi::BOOL_ WINAPI query_information_job_object(
  _In_ DWORD              cbJobObjectInfoLength
 );*/

-typedef ::boost::winapi::BOOL_  ( WINAPI *set_information_job_object_p)(
+typedef ::boost::winapi::BOOL_  (*set_information_job_object_p)(
        ::boost::winapi::HANDLE_,
        JOBOBJECTINFOCLASS_,
        void *,
@@ -118,7 +118,7 @@ typedef ::boost::winapi::BOOL_  ( WINAPI *set_information_job_object_p)(

 }

-inline ::boost::winapi::BOOL_ WINAPI set_information_job_object(
+inline ::boost::winapi::BOOL_ set_information_job_object(
        ::boost::winapi::HANDLE_ hJob,
        JOBOBJECTINFOCLASS_ JobObjectInfoClass,
        void * lpJobObjectInfo,
Author	SHA1	Message	Date
Klemens David Morgenstern	f1c6909eb0	Merge remote-tracking branch 'remotes/origin/develop'	2018-04-05 20:35:52 +02:00
Klemens Morgenstern	35fda5aa6a	Update job_workaround.hpp	2018-04-05 20:12:51 +02:00
Klemens Morgenstern	1f7f805858	Merge pull request #158 from klemens-morgenstern/develop Update job_workaround.hpp	2018-04-05 11:16:39 +02:00
Klemens Morgenstern	d47b7f7ac4	Update job_workaround.hpp	2018-04-05 10:08:00 +02:00
Klemens David Morgenstern	2bc2531d2a	Merge branch 'develop'	2018-04-04 20:55:25 +02:00
Klemens David Morgenstern	c5798fdf7f	added write_some and read_some overloads - closes #35	2018-03-13 10:11:01 +08:00
Klemens David Morgenstern	5e43e7c07c	Merge branch 'develop' of github.com:boostorg/process into develop	2018-03-11 20:58:22 +01:00
Klemens Morgenstern	4fc4784506	Merge pull request #34 from Lastique/update_winapi_cc Switch WINAPI calling convention macros to the replacements from Boost.WinAPI	2018-03-11 20:56:06 +01:00
Andrey Semashev	900aab5d6d	Switched WINAPI calling convention macros to the replacements from Boost.WinAPI WINAPI macro definition in Boost.WinAPI is deprecated as it may clash with the macro defined in Windows SDK.	2018-03-11 20:20:49 +03:00
Klemens Morgenstern	f61a61cf59	Merge pull request #144 from klemens-morgenstern/develop Another master updates	2018-02-26 23:25:28 +01:00
Klemens Morgenstern	9f6c338631	Merge pull request #140 from klemens-morgenstern/develop master update	2018-02-07 00:19:10 +01:00
Klemens Morgenstern	c4ffd0c18d	Merge pull request #135 from klemens-morgenstern/develop Appveyor fixes	2018-02-02 23:26:12 +01:00