Merge remote-tracking branch 'origin/master'

src/platform/windows/display_base.cpp

@@ -7,9 +7,9 @@
 #include <thread>
 
 #include <boost/algorithm/string/join.hpp>
-#include <boost/process.hpp>
+#include <boost/process/v1.hpp>
 
-// We have to include boost/process.hpp before display.h due to WinSock.h,
+// We have to include boost/process/v1.hpp before display.h due to WinSock.h,
 // but that prevents the definition of NTSTATUS so we must define it ourself.
 typedef long NTSTATUS;
 

src/platform/windows/misc.cpp

@@ -10,7 +10,7 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/asio/ip/address.hpp>
-#include <boost/process.hpp>
+#include <boost/process/v1.hpp>
 #include <boost/program_options/parsers.hpp>
 
 // prevent clang format from "optimizing" the header include order
@@ -1121,7 +1121,7 @@ namespace platf {
    */
   void
   open_url(const std::string &url) {
-    boost::process::environment _env = boost::this_process::environment();
+    boost::process::v1::environment _env = boost::this_process::environment();
     auto working_dir = boost::filesystem::path();
     std::error_code ec;