izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump boost to 1.88.0

Browse Source
This commit is contained in:
Yukino Song
2025-05-26 11:37:40 +08:00
parent a94e8ec4f9
commit a1ecd25700
7 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/dependencies/Boost_Sunshine.cmake
View File

@@ -3,7 +3,7 @@
# #
include_guard(GLOBAL) include_guard(GLOBAL)
set(BOOST_VERSION "1.87.0") set(BOOST_VERSION "1.88.0")
set(BOOST_COMPONENTS set(BOOST_COMPONENTS
filesystem filesystem
locale locale

2
src/platform/windows/display_base.cpp
View File

@@ -11,7 +11,6 @@
// lib includes // lib includes
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
#include <boost/process/v1.hpp>
#include <MinHook.h> #include <MinHook.h>
// We have to include boost/process/v1.hpp before display.h due to WinSock.h, // We have to include boost/process/v1.hpp before display.h due to WinSock.h,
@@ -41,7 +40,6 @@ namespace platf {
} }
namespace platf::dxgi { namespace platf::dxgi {
namespace bp = boost::process;
/** /**
* DDAPI-specific initialization goes here. * DDAPI-specific initialization goes here.

12
src/platform/windows/misc.cpp
View File

@@ -10,10 +10,16 @@
#include <set> #include <set>
#include <sstream> #include <sstream>
#ifndef BOOST_PROCESS_VERSION
#define BOOST_PROCESS_VERSION 1
#endif
// lib includes // lib includes
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/asio/ip/address.hpp> #include <boost/asio/ip/address.hpp>
#include <boost/process/v1.hpp> #include <boost/process/v1/child.hpp>
#include <boost/process/v1/group.hpp>
#include <boost/process/v1/environment.hpp>
#include <boost/program_options/parsers.hpp> #include <boost/program_options/parsers.hpp>
// prevent clang format from "optimizing" the header include order // prevent clang format from "optimizing" the header include order
@@ -1949,3 +1955,7 @@ static int setClipboardData(const std::wstring& utf16Str) {
return 0; return 0;
} }
#ifdef BOOST_PROCESS_VERSION
#undef BOOST_PROCESS_VERSION
#endif

4
src/platform/windows/virtual_display.cpp
View File

@@ -1170,9 +1170,9 @@ std::vector< struct positionwidthheight*>rearrangeVirtualDisplayForLowerRight(st
// Utility function to match the DeviceString to the Display Names // Utility function to match the DeviceString to the Display Names
// Typical DeviceStrings are the driver names // Typical DeviceStrings are the driver names
// //
// Example: matchDisplay(L"SudoMaker Virtual Display Adapter") // Example: matchDisplay(L"SudoMaker Virtual Display Adapter")
// Result: L"\\\\.\\Display2" // Result: L"\\\\.\\Display2"
std::vector <std::wstring> matchDisplay(std::wstring sMatch) { std::vector <std::wstring> matchDisplay(std::wstring sMatch) {
DISPLAY_DEVICEW displayDevice; DISPLAY_DEVICEW displayDevice;

13
src/process.h
View File

@@ -8,12 +8,19 @@
#define __kernel_entry #define __kernel_entry
#endif #endif
#ifndef BOOST_PROCESS_VERSION
#define BOOST_PROCESS_VERSION 1
#endif
// standard includes // standard includes
#include <optional> #include <optional>
#include <unordered_map> #include <unordered_map>
// lib includes // lib includes
#include <boost/process/v1.hpp> #include <boost/process/v1/child.hpp>
#include <boost/process/v1/group.hpp>
#include <boost/process/v1/environment.hpp>
#include <boost/process/v1/search_path.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
@@ -189,3 +196,7 @@ namespace proc {
extern int terminate_app_id; extern int terminate_app_id;
extern std::string terminate_app_id_str; extern std::string terminate_app_id_str;
} // namespace proc } // namespace proc
#ifdef BOOST_PROCESS_VERSION
#undef BOOST_PROCESS_VERSION
#endif

9
src/system_tray.cpp
View File

@@ -29,6 +29,10 @@
#define TRAY_MSG_NO_APP_RUNNING "Reload Apps" #define TRAY_MSG_NO_APP_RUNNING "Reload Apps"
#ifndef BOOST_PROCESS_VERSION
#define BOOST_PROCESS_VERSION 1
#endif
// standard includes // standard includes
#include <csignal> #include <csignal>
#include <string> #include <string>
@@ -417,4 +421,9 @@ namespace system_tray {
} }
} // namespace system_tray } // namespace system_tray
#ifdef BOOST_PROCESS_VERSION
#undef BOOST_PROCESS_VERSION 1
#endif
#endif #endif

2
third-party/googletest vendored

Submodule third-party/googletest updated: 445e9bd8d0...04ee1b4f2a