renun/Sunshine
1
0
Fork 0
mirror of https://github.com/LizardByte/Sunshine.git synced 2025-08-10 00:52:16 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(boost)!: migrate boost to 1.86 (#3256)

Browse Source
This commit is contained in:
Lukas Senionis
2024-10-04 04:42:16 +03:00
committed by GitHub
parent 2c050d1cb0
commit e90b71ce62
11 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/process.cpp
View File

@@ -57,7 +57,7 @@ namespace proc {
}
void
terminate_process_group(boost::process::child &proc, boost::process::group &group, std::chrono::seconds exit_timeout) {
terminate_process_group(boost::process::v1::child &proc, boost::process::v1::group &group, std::chrono::seconds exit_timeout) {
if (group.valid() && platf::process_group_running((std::uintptr_t) group.native_handle())) {
if (exit_timeout.count() > 0) {
// Request processes in the group to exit gracefully
@@ -98,7 +98,7 @@ namespace proc {
}
boost::filesystem::path
find_working_directory(const std::string &cmd, boost::process::environment &env) {
find_working_directory(const std::string &cmd, boost::process::v1::environment &env) {
// Parse the raw command string into parts to get the actual command portion
#ifdef _WIN32
auto parts = boost::program_options::split_winmain(cmd);
@@ -120,7 +120,7 @@ namespace proc {
// If the cmd path is not an absolute path, resolve it using our PATH variable
boost::filesystem::path cmd_path(parts.at(0));
if (!cmd_path.is_absolute()) {
cmd_path = boost::process::search_path(parts.at(0));
cmd_path = boost::process::v1::search_path(parts.at(0));
if (cmd_path.empty()) {
BOOST_LOG(error) << "Unable to find executable ["sv << parts.at(0) << "]. Is it in your PATH?"sv;
return boost::filesystem::path();
@@ -301,8 +301,8 @@ namespace proc {
std::error_code ec;
placebo = false;
terminate_process_group(_process, _process_group, _app.exit_timeout);
_process = boost::process::child();
_process_group = boost::process::group();
_process = boost::process::v1::child();
_process_group = boost::process::v1::group();
for (; _app_prep_it != _app_prep_begin; --_app_prep_it) {
auto &cmd = *(_app_prep_it - 1);
@@ -403,7 +403,7 @@ namespace proc {
}
std::string
parse_env_val(boost::process::native_environment &env, const std::string_view &val_raw) {
parse_env_val(boost::process::v1::native_environment &env, const std::string_view &val_raw) {
auto pos = std::begin(val_raw);
auto dollar = std::find(pos, std::end(val_raw), '$');