Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Boost shipped for Windows to v1.87 #10278

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Don't use boost::asio::ip::tcp::resolver::query
It was removed in Boost 1.87.
Al2Klimov committed Jan 10, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 69e4f295a6bd5cdafb295379b207ab611c8501a6
6 changes: 2 additions & 4 deletions lib/base/tcpsocket.hpp
Original file line number Diff line number Diff line change
@@ -41,8 +41,7 @@ void Connect(Socket& socket, const String& node, const String& service)
using boost::asio::ip::tcp;

tcp::resolver resolver (IoEngine::Get().GetIoContext());
tcp::resolver::query query (node, service);
auto result (resolver.resolve(query));
auto result (resolver.resolve(node.CStr(), service.CStr()));
auto current (result.begin());

for (;;) {
@@ -72,8 +71,7 @@ void Connect(Socket& socket, const String& node, const String& service, boost::a
using boost::asio::ip::tcp;

tcp::resolver resolver (IoEngine::Get().GetIoContext());
tcp::resolver::query query (node, service);
auto result (resolver.async_resolve(query, yc));
auto result (resolver.async_resolve(node.CStr(), service.CStr(), yc));
auto current (result.begin());

for (;;) {
4 changes: 1 addition & 3 deletions lib/remote/apilistener.cpp
Original file line number Diff line number Diff line change
@@ -439,9 +439,7 @@ bool ApiListener::AddListener(const String& node, const String& service)

try {
tcp::resolver resolver (io);
tcp::resolver::query query (node, service, tcp::resolver::query::passive);

auto result (resolver.resolve(query));
auto result (resolver.resolve(node.CStr(), service.CStr(), tcp::resolver::passive));
auto current (result.begin());

for (;;) {