Move any_adapter

Author: anarthal

include/boost/redis/any_adapter.hpp renamed to include/boost/redis/adapter/any_adapter.hpp

@@ -7,7 +7,8 @@
 #ifndef BOOST_REDIS_CONNECTION_HPP
 #define BOOST_REDIS_CONNECTION_HPP
 
-#include <boost/redis/any_adapter.hpp>
+#include "boost/redis/request.hpp"
+#include <boost/redis/adapter/any_adapter.hpp>
 #include <boost/redis/detail/connection_base.hpp>
 #include <boost/redis/logger.hpp>
 #include <boost/redis/config.hpp>
@@ -18,7 +19,6 @@
 #include <boost/asio/any_completion_handler.hpp>
 
 #include <chrono>
-#include <memory>
 #include <limits>
 
 namespace boost::redis {
@@ -412,7 +412,12 @@ class connection {
    template <class CompletionToken>
    auto async_exec(request const& req, any_adapter adapter, CompletionToken token)
    {
-      return impl_.async_exec(req, std::move(adapter), std::move(token));
+      return asio::async_initiate<
+         CompletionToken, void(boost::system::error_code)>(
+            [](auto handler, connection* self, request const* req, any_adapter adapter)
+            {
+               self->async_exec_impl(*req, std::move(adapter), std::move(handler));
+            }, token, this, &req, std::move(adapter));
    }
 
    /// Calls `boost::redis::basic_connection::cancel`.
@@ -453,6 +458,12 @@ class connection {
       config const& cfg,
       logger l,
       asio::any_completion_handler<void(boost::system::error_code)> token);
+   
+   void
+   async_exec_impl(
+      request const& req,
+      any_adapter adapter,
+      asio::any_completion_handler<void(boost::system::error_code)> token);
 
    basic_connection<executor_type> impl_;
 };

include/boost/redis/connection.hpp

@@ -7,7 +7,7 @@
 #ifndef BOOST_REDIS_CONNECTION_BASE_HPP
 #define BOOST_REDIS_CONNECTION_BASE_HPP
 
-#include <boost/redis/any_adapter.hpp>
+#include <boost/redis/adapter/any_adapter.hpp>
 #include <boost/redis/adapter/adapt.hpp>
 #include <boost/redis/detail/helper.hpp>
 #include <boost/redis/error.hpp>
@@ -443,7 +443,7 @@ class connection_base {
    }
 
    template <class CompletionToken>
-   auto async_exec(request const& req, any_adapter adapter, CompletionToken token)
+   auto async_exec(request const& req, any_adapter adapter, CompletionToken&& token)
    {
       auto adapter_impl = std::move(adapter).get_impl();
       BOOST_ASSERT_MSG(req.get_expected_responses() <= adapter_impl.supported_response_size, "Request and response have incompatible sizes.");
@@ -456,12 +456,6 @@ class connection_base {
          >(exec_op<this_type>{this, info}, token, writer_timer_);
    }
 
-   template <class Response, class CompletionToken>
-   auto async_exec(request const& req, Response& resp, CompletionToken token)
-   {
-      return async_exec(req, any_adapter(resp), std::forward<CompletionToken>(token));
-   }
-
    template <class Response, class CompletionToken>
    [[deprecated("Set the response with set_receive_response and use the other overload.")]]
    auto async_receive(Response& response, CompletionToken token)

include/boost/redis/detail/connection_base.hpp

@@ -31,6 +31,15 @@ connection::async_run_impl(
    impl_.async_run(cfg, l, std::move(token));
 }
 
+void
+connection::async_exec_impl(
+   request const& req,
+   any_adapter adapter,
+   asio::any_completion_handler<void(boost::system::error_code)> token)
+{
+   impl_.async_exec(req, std::move(adapter), std::move(token));
+}
+
 void connection::cancel(operation op)
 {
    impl_.cancel(op);