{test,rgw,tools}: Explicitly use Boost.Process v1

Boost 1.88 removed the default of using the v1 interface
automatically. See https://github.com/boostorg/process/issues/480 for
an example.

https://www.boost.org/doc/libs/1_88_0/libs/process/doc/html/index.html#version_2
describes the new, preferred version which we probably want to migrate
to eventually.

In this change we simply include the v1 files and change the namespace
we alias.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/rgw/driver/rados/rgw_sal_rados.cc b/src/rgw/driver/rados/rgw_sal_rados.cc
index 34c9f2e4eecb1500efaa8c6f7ceccc87c4e54a13..481822bb1cc2b42c979b86287b4f6ac8d5f5109d 100644 (file)
--- a/src/rgw/driver/rados/rgw_sal_rados.cc
+++ b/src/rgw/driver/rados/rgw_sal_rados.cc
@@ -20,7 +20,6 @@
 #include <unistd.h>
 
 #include <boost/algorithm/string.hpp>
-#include <boost/process.hpp>
 
 #include <fmt/core.h>
 

diff --git a/src/rgw/rgw_lua.cc b/src/rgw/rgw_lua.cc
index a0f04f81d49e335992715eb1a6fb4280d4ef0da6..aacec7c7fe075a895c58e06d8202b0d9611fc42a 100644 (file)
--- a/src/rgw/rgw_lua.cc
+++ b/src/rgw/rgw_lua.cc
@@ -8,7 +8,13 @@
 #include "rgw_lua.h"
 #ifdef WITH_RADOSGW_LUA_PACKAGES
 #include <filesystem>
-#include <boost/process.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/env.hpp>
+#include <boost/process/v1/environment.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/search_path.hpp>
+#include <boost/process/v1/start_dir.hpp>
 #endif
 
 #define dout_subsys ceph_subsys_rgw
@@ -96,7 +102,7 @@ int delete_script(const DoutPrefixProvider *dpp, sal::LuaManager* manager, const
 
 #ifdef WITH_RADOSGW_LUA_PACKAGES
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 int add_package(const DoutPrefixProvider* dpp, rgw::sal::Driver* driver, optional_yield y, const std::string& package_name, bool allow_compilation)
 {
@@ -142,8 +148,6 @@ int remove_package(const DoutPrefixProvider *dpp, rgw::sal::Driver* driver, opti
   return driver->get_lua_manager("")->remove_package(dpp, y, package_name);
 }
 
-namespace bp = boost::process;
-
 int list_packages(const DoutPrefixProvider *dpp, rgw::sal::Driver* driver, optional_yield y, packages_t& packages)
 {
   return driver->get_lua_manager("")->list_packages(dpp, y, packages);

diff --git a/src/test/mon/test_mon_memory_target.cc b/src/test/mon/test_mon_memory_target.cc
index e8f975b47bb1315e048e2daa78a997e7f1810b27..1c87dbbca425db26cc4030bf3f9748c94e50891c 100644 (file)
--- a/src/test/mon/test_mon_memory_target.cc
+++ b/src/test/mon/test_mon_memory_target.cc
@@ -6,10 +6,12 @@
 #include <regex>
 #include <system_error>
 
-#include <boost/process.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/pipe.hpp>
 #include <boost/tokenizer.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 using namespace std;
 
 int main(int argc, char** argv)

diff --git a/src/tools/cephfs/ProgressTracker.cc b/src/tools/cephfs/ProgressTracker.cc
index fe9b6374637df866a26b50e832c03fb7fa58b638..52ed354a2afca24e4d2608fc0ea6e45d7eb13b60 100644 (file)
--- a/src/tools/cephfs/ProgressTracker.cc
+++ b/src/tools/cephfs/ProgressTracker.cc
@@ -6,13 +6,21 @@
 #include <string_view>
 
 #include <boost/asio.hpp>
-#include <boost/process.hpp>
+#include <boost/process/v1.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/env.hpp>
+#include <boost/process/v1/environment.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/async_pipe.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/search_path.hpp>
+#include <boost/process/v1/start_dir.hpp>
 
 #include "common/ceph_context.h"
 #include "global/global_context.h"
 #include "include/cephfs/libcephfs.h"
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 namespace asio = boost::asio;
 
 namespace {