From 0d4727d82a5a879baaa8080c805e02a9e230879a Mon Sep 17 00:00:00 2001 From: pajlada Date: Sat, 4 Apr 2026 14:30:27 +0200 Subject: [PATCH] fix: set `BOOST_ASIO_NO_DEPRECATED` (#6904) --- lib/twitch-eventsub-ws/src/CMakeLists.txt | 3 +++ src/CMakeLists.txt | 4 +++- src/common/websockets/detail/WebSocketPoolImpl.cpp | 11 +++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/twitch-eventsub-ws/src/CMakeLists.txt b/lib/twitch-eventsub-ws/src/CMakeLists.txt index e7b7362d8..2c76003ca 100644 --- a/lib/twitch-eventsub-ws/src/CMakeLists.txt +++ b/lib/twitch-eventsub-ws/src/CMakeLists.txt @@ -69,6 +69,9 @@ target_compile_definitions(${PROJECT_NAME} PUBLIC $<$:BOOST_CONTAINER_NO_LIB> QT_NO_KEYWORDS $<$:CHATTERINO_EXPECT_BOOST_JSON_FROM_DLL> + # Don't allow the use of deprecated Boost.Asio functionality + # https://www.boost.org/doc/libs/latest/doc/html/boost_asio/using.html#boost_asio.using.macros + BOOST_ASIO_NO_DEPRECATED ) if (MSVC) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0bcf348db..6837374be 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1168,7 +1168,6 @@ target_link_libraries(${LIBRARY_PROJECT} PRIVATE ${VERSION_PROJECT}) target_compile_definitions(${LIBRARY_PROJECT} PUBLIC CHATTERINO UNICODE - AB_CUSTOM_SETTINGS IRC_STATIC IRC_NAMESPACE=Communi $<$:_WIN32_WINNT=0x0A00> # Windows 10 @@ -1177,6 +1176,9 @@ target_compile_definitions(${LIBRARY_PROJECT} PUBLIC $<$:NOMINMAX> # Exclude some headers when including Windows.h $<$:WIN32_LEAN_AND_MEAN> + # Don't allow the use of deprecated Boost.Asio functionality + # https://www.boost.org/doc/libs/latest/doc/html/boost_asio/using.html#boost_asio.using.macros + BOOST_ASIO_NO_DEPRECATED ) set(_c2_qt_defs diff --git a/src/common/websockets/detail/WebSocketPoolImpl.cpp b/src/common/websockets/detail/WebSocketPoolImpl.cpp index 011a8f3d1..b609fd939 100644 --- a/src/common/websockets/detail/WebSocketPoolImpl.cpp +++ b/src/common/websockets/detail/WebSocketPoolImpl.cpp @@ -20,12 +20,11 @@ WebSocketPoolImpl::WebSocketPoolImpl(const QString &shortName) , work(this->ioc.get_executor()) { boost::system::error_code ec; - auto _ = this->ssl.set_options( - boost::asio::ssl::context::no_tlsv1 | - boost::asio::ssl::context::no_tlsv1_1 | - boost::asio::ssl::context::default_workarounds | - boost::asio::ssl::context::single_dh_use, - ec); + this->ssl.set_options(boost::asio::ssl::context::no_tlsv1 | + boost::asio::ssl::context::no_tlsv1_1 | + boost::asio::ssl::context::default_workarounds | + boost::asio::ssl::context::single_dh_use, + ec); if (ec) { qCWarning(chatterinoWebsocket) << "Failed to set SSL context options"