diff --git a/include/boost/mysql/connection.hpp b/include/boost/mysql/connection.hpp index d8e2480e..249102a5 100644 --- a/include/boost/mysql/connection.hpp +++ b/include/boost/mysql/connection.hpp @@ -207,7 +207,7 @@ public: */ template < typename EndpointType, - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code)) + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code)) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -242,7 +242,7 @@ public: */ template < typename EndpointType, - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code)) + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code)) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -291,7 +291,7 @@ public: * The handler signature for this operation is `void(boost::mysql::error_code)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code)) + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code)) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -319,7 +319,7 @@ public: * The handler signature for this operation is `void(boost::mysql::error_code)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code)) + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code)) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -362,7 +362,9 @@ public: * `void(boost::mysql::error_code, boost::mysql::resultset)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, resultset)) + BOOST_ASIO_COMPLETION_TOKEN_FOR( + void(::boost::mysql::error_code, ::boost::mysql::resultset) + ) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -387,7 +389,9 @@ public: * `void(boost::mysql::error_code, boost::mysql::resultset)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, resultset)) + BOOST_ASIO_COMPLETION_TOKEN_FOR( + void(::boost::mysql::error_code, ::boost::mysql::resultset) + ) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -424,7 +428,9 @@ public: * `void(boost::mysql::error_code, boost::mysql::prepared_statement)` */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, prepared_statement)) + BOOST_ASIO_COMPLETION_TOKEN_FOR( + void(::boost::mysql::error_code, ::boost::mysql::prepared_statement) + ) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -447,7 +453,9 @@ public: * `void(boost::mysql::error_code, boost::mysql::prepared_statement)` */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, prepared_statement)) + BOOST_ASIO_COMPLETION_TOKEN_FOR( + void(::boost::mysql::error_code, ::boost::mysql::prepared_statement) + ) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -493,7 +501,7 @@ public: * The handler signature for this operation is `void(boost::mysql::error_code)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code)) + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code)) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -515,7 +523,7 @@ public: * The handler signature for this operation is `void(boost::mysql::error_code)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code)) + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code)) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -570,7 +578,7 @@ public: * The handler signature for this operation is `void(boost::mysql::error_code)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code)) + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code)) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -595,7 +603,7 @@ public: * The handler signature for this operation is `void(boost::mysql::error_code)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code)) + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code)) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > diff --git a/include/boost/mysql/impl/connection.hpp b/include/boost/mysql/impl/connection.hpp index 5bdae51d..10e3f529 100644 --- a/include/boost/mysql/impl/connection.hpp +++ b/include/boost/mysql/impl/connection.hpp @@ -48,7 +48,7 @@ void boost::mysql::connection::connect( template template < class EndpointType, - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(boost::mysql::error_code)) CompletionToken + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code)) CompletionToken > BOOST_ASIO_INITFN_AUTO_RESULT_TYPE( CompletionToken, @@ -93,7 +93,7 @@ void boost::mysql::connection::handshake( } template -template +template BOOST_ASIO_INITFN_AUTO_RESULT_TYPE( CompletionToken, void(boost::mysql::error_code) @@ -141,7 +141,8 @@ boost::mysql::resultset boost::mysql::connection::query( template template )) CompletionToken> + void(::boost::mysql::error_code, ::boost::mysql::resultset) +) CompletionToken> BOOST_ASIO_INITFN_AUTO_RESULT_TYPE( CompletionToken, void(boost::mysql::error_code, boost::mysql::resultset) @@ -188,7 +189,8 @@ boost::mysql::prepared_statement boost::mysql::connection::prepa template template )) CompletionToken> + void(::boost::mysql::error_code, ::boost::mysql::prepared_statement) +) CompletionToken> BOOST_ASIO_INITFN_AUTO_RESULT_TYPE( CompletionToken, void(boost::mysql::error_code, boost::mysql::prepared_statement) @@ -228,7 +230,7 @@ void boost::mysql::connection::close() } template -template +template BOOST_ASIO_INITFN_AUTO_RESULT_TYPE( CompletionToken, void(boost::mysql::error_code) @@ -265,7 +267,7 @@ void boost::mysql::connection::quit() } template -template +template BOOST_ASIO_INITFN_AUTO_RESULT_TYPE( CompletionToken, void(boost::mysql::error_code) diff --git a/include/boost/mysql/impl/prepared_statement.hpp b/include/boost/mysql/impl/prepared_statement.hpp index 86507526..81e81994 100644 --- a/include/boost/mysql/impl/prepared_statement.hpp +++ b/include/boost/mysql/impl/prepared_statement.hpp @@ -134,7 +134,8 @@ struct boost::mysql::prepared_statement::async_execute_initiation template template )) CompletionToken> + void(::boost::mysql::error_code, ::boost::mysql::resultset) +) CompletionToken> BOOST_ASIO_INITFN_AUTO_RESULT_TYPE( CompletionToken, void(boost::mysql::error_code, boost::mysql::resultset) @@ -184,7 +185,7 @@ void boost::mysql::prepared_statement::close() } template -template +template BOOST_ASIO_INITFN_AUTO_RESULT_TYPE( CompletionToken, void(boost::mysql::error_code) diff --git a/include/boost/mysql/impl/resultset.hpp b/include/boost/mysql/impl/resultset.hpp index 952a2cdf..168c8562 100644 --- a/include/boost/mysql/impl/resultset.hpp +++ b/include/boost/mysql/impl/resultset.hpp @@ -172,7 +172,7 @@ struct boost::mysql::resultset::read_one_op template template + void(::boost::mysql::error_code, bool)) CompletionToken> BOOST_ASIO_INITFN_AUTO_RESULT_TYPE( CompletionToken, void(boost::mysql::error_code, bool) @@ -303,7 +303,7 @@ struct boost::mysql::resultset::read_many_op template template )) CompletionToken> + void(::boost::mysql::error_code, std::vector<::boost::mysql::row>)) CompletionToken> BOOST_ASIO_INITFN_AUTO_RESULT_TYPE( CompletionToken, void(boost::mysql::error_code, std::vector) @@ -328,7 +328,7 @@ boost::mysql::resultset::async_read_many( template template )) CompletionToken> + void(::boost::mysql::error_code, std::vector<::boost::mysql::row>)) CompletionToken> BOOST_ASIO_INITFN_AUTO_RESULT_TYPE( CompletionToken, void(boost::mysql::error_code, std::vector) diff --git a/include/boost/mysql/prepared_statement.hpp b/include/boost/mysql/prepared_statement.hpp index adf2c914..b9a2ff64 100644 --- a/include/boost/mysql/prepared_statement.hpp +++ b/include/boost/mysql/prepared_statement.hpp @@ -153,7 +153,9 @@ public: */ template < class ValueCollection, - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, resultset)) + BOOST_ASIO_COMPLETION_TOKEN_FOR( + void(::boost::mysql::error_code, ::boost::mysql::resultset) + ) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type), class EnableIf = detail::enable_if_value_collection @@ -187,7 +189,9 @@ public: */ template < class ValueCollection, - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, resultset)) + BOOST_ASIO_COMPLETION_TOKEN_FOR( + void(::boost::mysql::error_code, ::boost::mysql::resultset) + ) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type), class EnableIf = detail::enable_if_value_collection @@ -257,7 +261,9 @@ public: */ template < class ValueForwardIterator, - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, resultset)) + BOOST_ASIO_COMPLETION_TOKEN_FOR( + void(::boost::mysql::error_code, ::boost::mysql::resultset) + ) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -291,7 +297,9 @@ public: */ template < class ValueForwardIterator, - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, resultset)) + BOOST_ASIO_COMPLETION_TOKEN_FOR( + void(::boost::mysql::error_code, ::boost::mysql::resultset) + ) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -330,7 +338,7 @@ public: * The handler signature for this operation is `void(boost::mysql::error_code)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code)) + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code)) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -350,7 +358,7 @@ public: * The handler signature for this operation is `void(boost::mysql::error_code)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code)) + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code)) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > diff --git a/include/boost/mysql/resultset.hpp b/include/boost/mysql/resultset.hpp index c624b9f7..2fcb869d 100644 --- a/include/boost/mysql/resultset.hpp +++ b/include/boost/mysql/resultset.hpp @@ -137,7 +137,7 @@ class resultset * `void(boost::mysql::error_code, bool)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, bool)) + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, bool)) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -163,7 +163,7 @@ class resultset * `void(boost::mysql::error_code, bool)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, bool)) + BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::mysql::error_code, bool)) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -188,7 +188,9 @@ class resultset * `void(boost::mysql::error_code, std::vector)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, std::vector)) + BOOST_ASIO_COMPLETION_TOKEN_FOR( + void(::boost::mysql::error_code, std::vector<::boost::mysql::row>) + ) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -209,7 +211,9 @@ class resultset * `void(boost::mysql::error_code, std::vector)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, std::vector)) + BOOST_ASIO_COMPLETION_TOKEN_FOR( + void(::boost::mysql::error_code, std::vector<::boost::mysql::row>) + ) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -233,7 +237,9 @@ class resultset * `void(boost::mysql::error_code, std::vector)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, std::vector)) + BOOST_ASIO_COMPLETION_TOKEN_FOR( + void(::boost::mysql::error_code, std::vector<::boost::mysql::row>) + ) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) > @@ -250,7 +256,9 @@ class resultset * `void(boost::mysql::error_code, std::vector)`. */ template < - BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, std::vector)) + BOOST_ASIO_COMPLETION_TOKEN_FOR( + void(::boost::mysql::error_code, std::vector<::boost::mysql::row>) + ) CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type) >