diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-04-13 17:54:47 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-04-13 19:05:27 +0200 |
| commit | ae787614624fc2b6c0c22efbdfdefc42b68a8ff7 (patch) | |
| tree | 0bda10ed9919562b351dbdd517399e005a5c9559 | |
| parent | 9c22e1df93b36beb4b880c0276873d5d102ddfce (diff) | |
Dep/Boost: Support boost 1.88
(cherry picked from commit 1b353abbf7deb9dade959e8f5074df5028ef882b)
| -rw-r--r-- | src/common/Utilities/StartProcess.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/common/Utilities/StartProcess.cpp b/src/common/Utilities/StartProcess.cpp index b3d79cde516..c5aa2d8c024 100644 --- a/src/common/Utilities/StartProcess.cpp +++ b/src/common/Utilities/StartProcess.cpp @@ -15,22 +15,26 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +// compatibility for booost 1.74 (no boost/process/v1/) and 1.88 (no boost/process/) +#if __has_include(<boost/process/v1/args.hpp>) +#define BOOST_PROCESS_V1_HEADER(header) <boost/process/v1/header> +#define BOOST_PROCESS_VERSION 1 +#else +#define BOOST_PROCESS_V1_HEADER(header) <boost/process/header> +#endif + #include "StartProcess.h" #include "Errors.h" #include "Log.h" #include "Optional.h" -#ifndef BOOST_ALLOW_DEPRECATED_HEADERS -#define BOOST_ALLOW_DEPRECATED_HEADERS -#include <boost/process/args.hpp> -#include <boost/process/child.hpp> -#include <boost/process/env.hpp> -#include <boost/process/error.hpp> -#include <boost/process/exe.hpp> -#include <boost/process/io.hpp> -#include <boost/process/pipe.hpp> -#include <boost/process/search_path.hpp> -#undef BOOST_ALLOW_DEPRECATED_HEADERS -#endif +#include BOOST_PROCESS_V1_HEADER(args.hpp) +#include BOOST_PROCESS_V1_HEADER(child.hpp) +#include BOOST_PROCESS_V1_HEADER(env.hpp) +#include BOOST_PROCESS_V1_HEADER(error.hpp) +#include BOOST_PROCESS_V1_HEADER(exe.hpp) +#include BOOST_PROCESS_V1_HEADER(io.hpp) +#include BOOST_PROCESS_V1_HEADER(pipe.hpp) +#include BOOST_PROCESS_V1_HEADER(search_path.hpp) #include <fmt/ranges.h> namespace bp = boost::process; |