Merge branch 'master' into develop-merge

Closes #202
Added missing incldue
2026-01-20 16:52:14 +00:00 · 2022-06-20 02:38:26 +08:00 · 2022-06-11 15:00:32 +08:00 · 2022-06-11 13:25:27 +08:00 · 2022-06-11 13:15:49 +08:00 · 2022-06-03 01:05:51 +08:00
4 changed files with 11 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,6 @@ add_library(boost_process INTERFACE)
 add_library(Boost::process ALIAS boost_process)

 target_include_directories(boost_process INTERFACE include)
-include_directories(include)
 target_link_libraries(boost_process
  INTERFACE
    Boost::algorithm
--- a/include/boost/process/detail/posix/executor.hpp
+++ b/include/boost/process/detail/posix/executor.hpp
@@ -151,6 +151,7 @@ class executor

    int _pipe_sink = -1;

+
    void write_error(const std::error_code & ec, const char * msg)
    {
        //I am the child
@@ -327,6 +328,13 @@ public:
    }
    void set_error(const std::error_code &ec, const std::string &msg) {set_error(ec, msg.c_str());};

+    std::vector<int> get_used_handles() const 
+    {
+        if (_pipe_sink == -1)
+            return {};
+        else
+            return {_pipe_sink};
+    };
 };

 template<typename Sequence>
--- a/include/boost/process/detail/posix/handles.hpp
+++ b/include/boost/process/detail/posix/handles.hpp
@@ -11,6 +11,8 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <algorithm>
+#include <memory>
+#include <cstdlib>
 #include <boost/process/detail/posix/handler.hpp>

 namespace boost { namespace process { namespace detail { namespace posix {
--- a/include/boost/process/detail/used_handles.hpp
+++ b/include/boost/process/detail/used_handles.hpp
@@ -69,7 +69,7 @@ template<typename Executor>
 std::vector<::boost::process::detail::api::native_handle_type>
        get_used_handles(Executor &exec)
 {
-    std::vector<::boost::process::detail::api::native_handle_type> res;
+    std::vector<::boost::process::detail::api::native_handle_type> res = exec.get_used_handles();
    foreach_used_handle(exec, [&](::boost::process::detail::api::native_handle_type handle){res.push_back(handle);});
    return res;
 }
Author	SHA1	Message	Date
Klemens Morgenstern	6e597b5c8a	Merge branch 'master' into develop-merge	2022-06-20 02:38:26 +08:00
Klemens	1a1d677d76	Closes #202	2022-06-11 15:00:32 +08:00
Klemens	c1fb7758b2	Added missing incldue	2022-06-11 13:25:27 +08:00
Klemens Morgenstern	e24af699cf	Merge pull request #257 from boostorg/v2 V2	2022-06-11 13:15:49 +08:00
Klemens Morgenstern	3a401dd306	Merge pull request #253 from Flamefire/patch-1 Remove superflous calls in CMakeLists	2022-06-03 01:05:51 +08:00
Alexander Grund	47c4496d05	Remove superflous calls in CMakeLists The find_package is not required, as the dependencies are done using the superproject build The include_directories is already there: target_include_directories	2022-05-23 16:12:28 +02:00
Klemens Morgenstern	dc8ba65c77	Merge pull request #249 from ikrijan/patch-1 Update executor.hpp	2022-05-13 23:49:56 +08:00
ikrijan	ea26c7b2bd	Update executor.hpp explicit cast to int to silence this: `error: non-constant-expression cannot be narrowed from type 'unsigned long' to 'int' in initializer list [-Wc++11-narrowing]`	2022-05-13 16:50:25 +02:00
Klemens Morgenstern	c1d0f1be76	Merge pull request #227 from x-santiaga-x/patch-1 Closes klemens-morgenstern/boost-process#218	2021-10-29 18:59:23 +08:00
Klemens Morgenstern	10c93d88a1	Merge pull request #228 from x-santiaga-x/patch-2 Fix missing headers	2021-10-29 18:55:03 +08:00
silent	5f80e72e9c	Closes klemens-morgenstern/boost-process#218	2021-10-29 13:24:19 +03:00
silent	d26ef52519	fix missing headers	2021-10-29 12:18:20 +03:00
Klemens Morgenstern	f4d2c260d4	Merge pull request #231 from klemens-morgenstern/develop Master update	2021-10-27 17:36:17 +08:00
Klemens Morgenstern	e32651a260	Removed overly constraint tests.	2021-10-27 12:23:18 +08:00
Klemens Morgenstern	71aa7d9c00	Merge commit 'ed3b066' into develop	2021-10-27 11:45:43 +08:00
Klemens Morgenstern	ed3b066da1	Multiple windows test fixes	2021-10-27 11:43:33 +08:00
Klemens	83380dad79	Increased log level on windows.	2021-10-26 23:53:02 +08:00
Klemens	5ad5e82577	Trying to catch windows early complete.	2021-10-22 19:42:53 +08:00
Klemens	3acc1a3fa8	Added missing work guard on windows.	2021-10-16 15:46:11 +08:00
Klemens	9bb088ed5d	Closes boostorg/process#191 .	2021-10-15 10:57:01 +08:00
Klemens	cd4ef692e1	Closes boostorg/process#189 .	2021-10-15 10:54:38 +08:00
Klemens	268795f3c0	Multiple fixes.	2021-10-14 17:41:27 +08:00
Klemens	f8f9c2323c	Changed child(pid_t) signature.	2021-10-14 15:36:07 +08:00
Klemens	0c3ded6636	Closes boostorg/process#197 .	2021-10-14 15:36:07 +08:00
Klemens	20b328dbf1	Attempting to fix wchar_t build error on circle.	2021-10-14 14:48:23 +08:00
Klemens	a60203dac3	Closes boostorg/process#121	2021-10-14 14:48:23 +08:00
Klemens	6d08cb369e	Closes boostorg/process#190	2021-10-14 14:28:07 +08:00
Klemens	8dc5ee22f5	Merge remote-tracking branch 'boostorg/develop' into develop	2021-10-14 14:20:27 +08:00
Klemens	a13a60d428	Removed unneeded WNOHANG.	2021-10-14 14:19:32 +08:00
Klemens Morgenstern	fa2a522ef2	Merge pull request #220 from odhinnsrunes/file_descriptor_move_assign_fix Fixed file_descriptor move assignment operator returns a reference to this.	2021-10-14 14:14:23 +08:00
James Baker	baa8d3fe7c	Returning this instead of erroneous this. Issue # 219	2020-08-28 12:43:16 -04:00
James Baker	42bdfb5545	Fixed file_descriptor move assignment operator to return a reference to 'this'. Issue # 219	2020-08-28 11:13:39 -04:00