[Boost-commit] svn:boost r85739 - in trunk/boost/asio/detail: . impl

Subject: [Boost-commit] svn:boost r85739 - in trunk/boost/asio/detail: . impl
From: chris_at_[hidden]
Date: 2013-09-17 17:36:54

Author: chris_kohlhoff
Date: 2013-09-17 17:36:54 EDT (Tue, 17 Sep 2013)
New Revision: 85739
URL: http://svn.boost.org/trac/boost/changeset/85739

Log:
Remove unused parameters and member variables.

Text files modified: 
   trunk/boost/asio/detail/impl/socket_ops.ipp            |     4 +---                                    
   trunk/boost/asio/detail/reactive_socket_connect_op.hpp |    21 +++++++--------------                   
   trunk/boost/asio/detail/reactive_socket_service.hpp    |     4 ++--                                    
   trunk/boost/asio/detail/socket_ops.hpp                 |     1 -                                       
   trunk/boost/asio/detail/win_iocp_socket_service.hpp    |     4 ++--                                    
   5 files changed, 12 insertions(+), 22 deletions(-)

Modified: trunk/boost/asio/detail/impl/socket_ops.ipp
==============================================================================
--- trunk/boost/asio/detail/impl/socket_ops.ipp	Tue Sep 17 17:35:43 2013	(r85738)
+++ trunk/boost/asio/detail/impl/socket_ops.ipp	2013-09-17 17:36:54 EDT (Tue, 17 Sep 2013)	(r85739)
@@ -508,9 +508,7 @@
       boost::asio::error::get_system_category());
 }
 
-bool non_blocking_connect(socket_type s,
-    const socket_addr_type*, std::size_t,
-    boost::system::error_code& ec)
+bool non_blocking_connect(socket_type s, boost::system::error_code& ec)
 {
   // Check if the connect operation has finished. This is required since we may
   // get spurious readiness notifications from the reactor.

Modified: trunk/boost/asio/detail/reactive_socket_connect_op.hpp
==============================================================================
--- trunk/boost/asio/detail/reactive_socket_connect_op.hpp	Tue Sep 17 17:35:43 2013	(r85738)
+++ trunk/boost/asio/detail/reactive_socket_connect_op.hpp	2013-09-17 17:36:54 EDT (Tue, 17 Sep 2013)	(r85739)
@@ -29,15 +29,12 @@
 namespace asio {
 namespace detail {
 
-template <typename Protocol>
 class reactive_socket_connect_op_base : public reactor_op
 {
 public:
-  reactive_socket_connect_op_base(socket_type socket,
-      const typename Protocol::endpoint& peer_endpoint, func_type complete_func)
+  reactive_socket_connect_op_base(socket_type socket, func_type complete_func)
     : reactor_op(&reactive_socket_connect_op_base::do_perform, complete_func),
-      socket_(socket),
-      peer_endpoint_(peer_endpoint)
+      socket_(socket)
   {
   }
 
@@ -46,25 +43,21 @@
     reactive_socket_connect_op_base* o(
         static_cast<reactive_socket_connect_op_base*>(base));
 
-    return socket_ops::non_blocking_connect(o->socket_,
-        o->peer_endpoint_.data(), o->peer_endpoint_.size(), o->ec_);
+    return socket_ops::non_blocking_connect(o->socket_, o->ec_);
   }
 
 private:
   socket_type socket_;
-  typename Protocol::endpoint peer_endpoint_;
 };
 
-template <typename Protocol, typename Handler>
-class reactive_socket_connect_op :
-  public reactive_socket_connect_op_base<Protocol>
+template <typename Handler>
+class reactive_socket_connect_op : public reactive_socket_connect_op_base
 {
 public:
   BOOST_ASIO_DEFINE_HANDLER_PTR(reactive_socket_connect_op);
 
-  reactive_socket_connect_op(socket_type socket,
-      const typename Protocol::endpoint& peer_endpoint, Handler& handler)
-    : reactive_socket_connect_op_base<Protocol>(socket, peer_endpoint,
+  reactive_socket_connect_op(socket_type socket, Handler& handler)
+    : reactive_socket_connect_op_base(socket,
         &reactive_socket_connect_op::do_complete),
       handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler))
   {

Modified: trunk/boost/asio/detail/reactive_socket_service.hpp
==============================================================================
--- trunk/boost/asio/detail/reactive_socket_service.hpp	Tue Sep 17 17:35:43 2013	(r85738)
+++ trunk/boost/asio/detail/reactive_socket_service.hpp	2013-09-17 17:36:54 EDT (Tue, 17 Sep 2013)	(r85739)
@@ -434,11 +434,11 @@
       boost_asio_handler_cont_helpers::is_continuation(handler);
 
     // Allocate and construct an operation to wrap the handler.
-    typedef reactive_socket_connect_op<Protocol, Handler> op;
+    typedef reactive_socket_connect_op<Handler> op;
     typename op::ptr p = { boost::asio::detail::addressof(handler),
       boost_asio_handler_alloc_helpers::allocate(
         sizeof(op), handler), 0 };
-    p.p = new (p.v) op(impl.socket_, peer_endpoint, handler);
+    p.p = new (p.v) op(impl.socket_, handler);
 
     BOOST_ASIO_HANDLER_CREATION((p.p, "socket", &impl, "async_connect"));
 

Modified: trunk/boost/asio/detail/socket_ops.hpp
==============================================================================
--- trunk/boost/asio/detail/socket_ops.hpp	Tue Sep 17 17:35:43 2013	(r85738)
+++ trunk/boost/asio/detail/socket_ops.hpp	2013-09-17 17:36:54 EDT (Tue, 17 Sep 2013)	(r85739)
@@ -107,7 +107,6 @@
     std::size_t addrlen, boost::system::error_code& ec);
 
 BOOST_ASIO_DECL bool non_blocking_connect(socket_type s,
-    const socket_addr_type* addr, std::size_t addrlen,
     boost::system::error_code& ec);
 
 BOOST_ASIO_DECL int socketpair(int af, int type, int protocol,

Modified: trunk/boost/asio/detail/win_iocp_socket_service.hpp
==============================================================================
--- trunk/boost/asio/detail/win_iocp_socket_service.hpp	Tue Sep 17 17:35:43 2013	(r85738)
+++ trunk/boost/asio/detail/win_iocp_socket_service.hpp	2013-09-17 17:36:54 EDT (Tue, 17 Sep 2013)	(r85739)
@@ -484,11 +484,11 @@
       const endpoint_type& peer_endpoint, Handler& handler)
   {
     // Allocate and construct an operation to wrap the handler.
-    typedef reactive_socket_connect_op<Protocol, Handler> op;
+    typedef reactive_socket_connect_op<Handler> op;
     typename op::ptr p = { boost::asio::detail::addressof(handler),
       boost_asio_handler_alloc_helpers::allocate(
         sizeof(op), handler), 0 };
-    p.p = new (p.v) op(impl.socket_, peer_endpoint, handler);
+    p.p = new (p.v) op(impl.socket_, handler);
 
     BOOST_ASIO_HANDLER_CREATION((p.p, "socket", &impl, "async_connect"));