Fix error in ip::basic_resolver's use of async_result.
diff --git a/asio/include/asio/ip/basic_resolver.hpp b/asio/include/asio/ip/basic_resolver.hpp index 65c0d2b..838ad98 100644 --- a/asio/include/asio/ip/basic_resolver.hpp +++ b/asio/include/asio/ip/basic_resolver.hpp
@@ -153,7 +153,7 @@ */ template <typename ResolveHandler> ASIO_INITFN_RESULT_TYPE(ResolveHandler, - void (asio::error_code)) + void (asio::error_code, iterator)) async_resolve(const query& q, ASIO_MOVE_ARG(ResolveHandler) handler) { @@ -246,7 +246,7 @@ */ template <typename ResolveHandler> ASIO_INITFN_RESULT_TYPE(ResolveHandler, - void (asio::error_code)) + void (asio::error_code, iterator)) async_resolve(const endpoint_type& e, ASIO_MOVE_ARG(ResolveHandler) handler) {
diff --git a/asio/include/asio/ip/resolver_service.hpp b/asio/include/asio/ip/resolver_service.hpp index 8ae167f..2cfd61d 100644 --- a/asio/include/asio/ip/resolver_service.hpp +++ b/asio/include/asio/ip/resolver_service.hpp
@@ -105,12 +105,12 @@ /// Asynchronously resolve a query to a list of entries. template <typename ResolveHandler> ASIO_INITFN_RESULT_TYPE(ResolveHandler, - void (asio::error_code)) + void (asio::error_code, iterator_type)) async_resolve(implementation_type& impl, const query_type& query, ASIO_MOVE_ARG(ResolveHandler) handler) { asio::detail::async_result_init< - ResolveHandler, void (asio::error_code)> init( + ResolveHandler, void (asio::error_code, iterator_type)> init( ASIO_MOVE_CAST(ResolveHandler)(handler)); service_impl_.async_resolve(impl, query, init.handler); @@ -128,12 +128,12 @@ /// Asynchronously resolve an endpoint to a list of entries. template <typename ResolveHandler> ASIO_INITFN_RESULT_TYPE(ResolveHandler, - void (asio::error_code)) + void (asio::error_code, iterator_type)) async_resolve(implementation_type& impl, const endpoint_type& endpoint, ASIO_MOVE_ARG(ResolveHandler) handler) { asio::detail::async_result_init< - ResolveHandler, void (asio::error_code)> init( + ResolveHandler, void (asio::error_code, iterator_type)> init( ASIO_MOVE_CAST(ResolveHandler)(handler)); service_impl_.async_resolve(impl, endpoint, init.handler);