diff --git a/CHANGELOG.md b/CHANGELOG.md index 92ff87aa..87abb455 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Version 61: * Fix shadowing warnings * Tidy up http-crawl example * Add multi_port to server-framework +* Tidy up resolver calls API Changes: diff --git a/example/http-client-ssl/http_client_ssl.cpp b/example/http-client-ssl/http_client_ssl.cpp index 74d1d499..88e12433 100644 --- a/example/http-client-ssl/http_client_ssl.cpp +++ b/example/http-client-ssl/http_client_ssl.cpp @@ -33,7 +33,7 @@ int main() // Look up the domain name std::string const host = "www.example.com"; - auto const lookup = r.resolve(boost::asio::ip::tcp::resolver::query{host, "https"}, ec); + auto const lookup = r.resolve({host, "https"}, ec); if(ec) return fail("resolve", ec); diff --git a/example/http-client/http_client.cpp b/example/http-client/http_client.cpp index 0683735d..e1e496e3 100644 --- a/example/http-client/http_client.cpp +++ b/example/http-client/http_client.cpp @@ -35,7 +35,7 @@ int main() // Look up the domain name std::string const host = "www.example.com"; - auto const lookup = r.resolve(boost::asio::ip::tcp::resolver::query{host, "http"}, ec); + auto const lookup = r.resolve({host, "http"}, ec); if(ec) return fail("resolve", ec); diff --git a/example/http-crawl/http_crawl.cpp b/example/http-crawl/http_crawl.cpp index b089e5d7..24c4e47b 100644 --- a/example/http-crawl/http_crawl.cpp +++ b/example/http-crawl/http_crawl.cpp @@ -48,7 +48,7 @@ main(int, char const*[]) // Look up the domain name boost::asio::ip::tcp::resolver r(ios); - auto lookup = r.resolve(boost::asio::ip::tcp::resolver::query{host, "http"}, ec); + auto lookup = r.resolve({host, "http"}, ec); if(ec) { fail("resolve", ec); diff --git a/example/websocket-client-ssl/websocket_client_ssl.cpp b/example/websocket-client-ssl/websocket_client_ssl.cpp index 23034004..cae706ad 100644 --- a/example/websocket-client-ssl/websocket_client_ssl.cpp +++ b/example/websocket-client-ssl/websocket_client_ssl.cpp @@ -34,7 +34,7 @@ int main() // Look up the domain name std::string const host = "echo.websocket.org"; - auto const lookup = r.resolve(boost::asio::ip::tcp::resolver::query{host, "https"}, ec); + auto const lookup = r.resolve({host, "https"}, ec); if(ec) return fail("resolve", ec); diff --git a/example/websocket-client/websocket_client.cpp b/example/websocket-client/websocket_client.cpp index cbe1e8dd..495b4ece 100644 --- a/example/websocket-client/websocket_client.cpp +++ b/example/websocket-client/websocket_client.cpp @@ -34,7 +34,7 @@ int main() // Look up the domain name std::string const host = "echo.websocket.org"; - auto const lookup = r.resolve(boost::asio::ip::tcp::resolver::query{host, "http"}, ec); + auto const lookup = r.resolve({host, "http"}, ec); if(ec) return fail("resolve", ec); diff --git a/test/core/doc_snippets.cpp b/test/core/doc_snippets.cpp index db025f52..0fa3e97c 100644 --- a/test/core/doc_snippets.cpp +++ b/test/core/doc_snippets.cpp @@ -40,8 +40,7 @@ boost::asio::ip::tcp::socket sock{ios}; char const* const host = "www.example.com"; boost::asio::ip::tcp::resolver r{ios}; boost::asio::ip::tcp::socket stream{ios}; -boost::asio::connect(stream, r.resolve( - boost::asio::ip::tcp::resolver::query{host, "http"})); +boost::asio::connect(stream, r.resolve({host, "http"})); // At this point `stream` is a connected to a remote // host and may be used to perform stream operations. diff --git a/test/websocket/doc_snippets.cpp b/test/websocket/doc_snippets.cpp index bf54708c..0c7f82c8 100644 --- a/test/websocket/doc_snippets.cpp +++ b/test/websocket/doc_snippets.cpp @@ -58,8 +58,7 @@ boost::asio::ip::tcp::socket sock{ios}; std::string const host = "mywebapp.com"; boost::asio::ip::tcp::resolver r{ios}; stream ws{ios}; - boost::asio::connect(ws.next_layer(), - r.resolve(boost::asio::ip::tcp::resolver::query{host, "ws"})); + boost::asio::connect(ws.next_layer(), r.resolve({host, "ws"})); //] }