Skip to content

Commit 1d3f95e

Browse files
Reenabled pdfork.
1 parent 58586e4 commit 1d3f95e

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.drone.star

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ windowsglobalimage="cppalliance/dronevs2019"
1414

1515
def main(ctx):
1616
return [
17-
freebsd_cxx("gcc 11 freebsd", "g++-11", buildtype="boost", buildscript="drone", freebsd_version="13.1", environment={'B2_TOOLSET': 'gcc-11', 'B2_CXXSTD': '17,20', 'B2_LINKFLAGS': '-Wl,-rpath=/usr/local/lib/gcc11'}, globalenv=globalenv),
18-
freebsd_cxx("clang 14 freebsd", "clang++-14", buildtype="boost", buildscript="drone", freebsd_version="13.1", environment={'B2_TOOLSET': 'clang-14', 'B2_CXXSTD': '17,20'}, globalenv=globalenv),
17+
freebsd_cxx("gcc freebsd", "g++", buildtype="boost", buildscript="drone", freebsd_version="13.1", environment={'B2_TOOLSET': 'gcc', 'B2_CXXSTD': '11'}, globalenv=globalenv),
18+
freebsd_cxx("clang 14 freebsd", "clang++-14", buildtype="boost", buildscript="drone", freebsd_version="13.1", environment={'B2_TOOLSET': 'clang-14', 'B2_CXXSTD': '11'}, globalenv=globalenv),
1919
linux_cxx("docs", "", packages="docbook docbook-xml docbook-xsl xsltproc libsaxonhe-java default-jre-headless flex libfl-dev bison unzip rsync", image="cppalliance/droneubuntu1804:1", buildtype="docs", buildscript="drone", environment={"COMMENT": "docs"}, globalenv=globalenv),
2020
linux_cxx("asan", "g++-8", packages="g++-8", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'asan', 'B2_VARIANT': 'debug', 'B2_TOOLSET': 'gcc-8', 'B2_CXXSTD': '11', 'B2_ASAN': '1', 'B2_DEFINES': 'BOOST_NO_STRESS_TEST=1', 'DRONE_EXTRA_PRIVILEGED': 'True', 'DRONE_JOB_UUID': '356a192b79'}, globalenv=globalenv, privileged=True),
2121
linux_cxx("ubsan", "g++-8", packages="g++-8", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'ubsan', 'B2_VARIANT': 'debug', 'B2_TOOLSET': 'gcc-8', 'B2_CXXSTD': '11', 'B2_UBSAN': '1', 'B2_DEFINES': 'BOOST_NO_STRESS_TEST=1', 'B2_LINKFLAGS': '-fuse-ld=gold', 'DRONE_JOB_UUID': '77de68daec'}, globalenv=globalenv),

include/boost/process/v2/detail/config.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ BOOST_PROCESS_V2_END_NAMESPACE
163163
#endif
164164
#endif
165165

166-
#if defined(__FreeBSD__) && defined(BOOST_PROCESS_V2_ENABLE_PDFORK)
166+
#if defined(__FreeBSD__) && !defined(BOOST_PROCESS_V2_DISABLE_PDFORK)
167167
#define BOOST_PROCESS_V2_PDFORK 1
168168
#define BOOST_PROCESS_V2_HAS_PROCESS_HANDLE 1
169169
#endif

include/boost/process/v2/detail/process_handle_fd_or_signal.hpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,9 +315,13 @@ struct basic_process_handle_fd_or_signal
315315

316316
struct async_wait_op_
317317
{
318-
net::posix::basic_descriptor<Executor> &descriptor;
318+
net::posix::basic_stream_descriptor<Executor> &descriptor;
319319
net::basic_signal_set<Executor> &handle;
320320
pid_type pid_;
321+
async_wait_op_(net::posix::basic_stream_descriptor<Executor> &descriptor,
322+
net::basic_signal_set<Executor> &handle,
323+
pid_type pid_) : descriptor(descriptor), handle(handle), pid_(pid_) {}
324+
321325
bool needs_post = true;
322326

323327
template<typename Self>
@@ -346,7 +350,7 @@ struct basic_process_handle_fd_or_signal
346350
needs_post = false;
347351
if (descriptor.is_open())
348352
descriptor.async_wait(
349-
net::posix::descriptor_base::wait_read,
353+
net::posix::descriptor_base::wait_write,
350354
std::move(self));
351355
else
352356
handle.async_wait(std::move(self));
@@ -379,10 +383,10 @@ struct basic_process_handle_fd_or_signal
379383
WaitHandler = net::default_completion_token_t<executor_type>>
380384
auto async_wait(WaitHandler &&handler = net::default_completion_token_t<executor_type>())
381385
-> decltype(net::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
382-
async_wait_op_{descriptor_, signal_set_, pid_}, handler, descriptor_))
386+
async_wait_op_(descriptor_, signal_set_, pid_), handler, descriptor_))
383387
{
384388
return net::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
385-
async_wait_op_{descriptor_, signal_set_, pid_}, handler, descriptor_);
389+
async_wait_op_(descriptor_, signal_set_, pid_), handler, descriptor_);
386390
}
387391
};
388392
}

0 commit comments

Comments
 (0)