1 files changed, 5 insertions, 91 deletions

diff --git a/boost/asio/detail/resolve_op.hpp b/boost/asio/detail/resolve_op.hpp
index 435e27026f..99f9772f97 100644
--- a/boost/asio/detail/resolve_op.hpp
+++ b/boost/asio/detail/resolve_op.hpp
@@ -17,16 +17,7 @@
 
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/error.hpp>
-#include <boost/asio/io_service.hpp>
-#include <boost/asio/ip/basic_resolver_iterator.hpp>
-#include <boost/asio/ip/basic_resolver_query.hpp>
-#include <boost/asio/detail/addressof.hpp>
-#include <boost/asio/detail/bind_handler.hpp>
-#include <boost/asio/detail/fenced_block.hpp>
-#include <boost/asio/detail/handler_alloc_helpers.hpp>
-#include <boost/asio/detail/handler_invoke_helpers.hpp>
 #include <boost/asio/detail/operation.hpp>
-#include <boost/asio/detail/socket_ops.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -34,94 +25,17 @@ namespace boost {
 namespace asio {
 namespace detail {
 
-template <typename Protocol, typename Handler>
 class resolve_op : public operation
 {
 public:
-  BOOST_ASIO_DEFINE_HANDLER_PTR(resolve_op);
-
-  typedef boost::asio::ip::basic_resolver_query<Protocol> query_type;
-  typedef boost::asio::ip::basic_resolver_iterator<Protocol> iterator_type;
-
-  resolve_op(socket_ops::weak_cancel_token_type cancel_token,
-      const query_type& query, io_service_impl& ios, Handler& handler)
-    : operation(&resolve_op::do_complete),
-      cancel_token_(cancel_token),
-      query_(query),
-      io_service_impl_(ios),
-      handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
-      addrinfo_(0)
-  {
-  }
+  // The error code to be passed to the completion handler.
+  boost::system::error_code ec_;
 
-  ~resolve_op()
+protected:
+  resolve_op(func_type complete_func)
+    : operation(complete_func)
   {
-    if (addrinfo_)
-      socket_ops::freeaddrinfo(addrinfo_);
   }
-
-  static void do_complete(io_service_impl* owner, operation* base,
-      const boost::system::error_code& /*ec*/,
-      std::size_t /*bytes_transferred*/)
-  {
-    // Take ownership of the operation object.
-    resolve_op* o(static_cast<resolve_op*>(base));
-    ptr p = { boost::asio::detail::addressof(o->handler_), o, o };
-
-    if (owner && owner != &o->io_service_impl_)
-    {
-      // The operation is being run on the worker io_service. Time to perform
-      // the resolver operation.
-    
-      // Perform the blocking host resolution operation.
-      socket_ops::background_getaddrinfo(o->cancel_token_,
-          o->query_.host_name().c_str(), o->query_.service_name().c_str(),
-          o->query_.hints(), &o->addrinfo_, o->ec_);
-
-      // Pass operation back to main io_service for completion.
-      o->io_service_impl_.post_deferred_completion(o);
-      p.v = p.p = 0;
-    }
-    else
-    {
-      // The operation has been returned to the main io_service. The completion
-      // handler is ready to be delivered.
-
-      BOOST_ASIO_HANDLER_COMPLETION((o));
-
-      // Make a copy of the handler so that the memory can be deallocated
-      // before the upcall is made. Even if we're not about to make an upcall,
-      // a sub-object of the handler may be the true owner of the memory
-      // associated with the handler. Consequently, a local copy of the handler
-      // is required to ensure that any owning sub-object remains valid until
-      // after we have deallocated the memory here.
-      detail::binder2<Handler, boost::system::error_code, iterator_type>
-        handler(o->handler_, o->ec_, iterator_type());
-      p.h = boost::asio::detail::addressof(handler.handler_);
-      if (o->addrinfo_)
-      {
-        handler.arg2_ = iterator_type::create(o->addrinfo_,
-            o->query_.host_name(), o->query_.service_name());
-      }
-      p.reset();
-
-      if (owner)
-      {
-        fenced_block b(fenced_block::half);
-        BOOST_ASIO_HANDLER_INVOCATION_BEGIN((handler.arg1_, "..."));
-        boost_asio_handler_invoke_helpers::invoke(handler, handler.handler_);
-        BOOST_ASIO_HANDLER_INVOCATION_END;
-      }
-    }
-  }
-
-private:
-  socket_ops::weak_cancel_token_type cancel_token_;
-  query_type query_;
-  io_service_impl& io_service_impl_;
-  Handler handler_;
-  boost::system::error_code ec_;
-  boost::asio::detail::addrinfo_type* addrinfo_;
 };
 
 } // namespace detail