diff options
Diffstat (limited to 'boost/asio/basic_socket.hpp')
| -rw-r--r-- | boost/asio/basic_socket.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/boost/asio/basic_socket.hpp b/boost/asio/basic_socket.hpp index 64aef6fb2b..777f6a9ce1 100644 --- a/boost/asio/basic_socket.hpp +++ b/boost/asio/basic_socket.hpp @@ -2,7 +2,7 @@ // basic_socket.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -193,10 +193,9 @@ public: template <typename Protocol1, typename SocketService1> basic_socket(basic_socket<Protocol1, SocketService1>&& other, typename enable_if<is_convertible<Protocol1, Protocol>::value>::type* = 0) - : basic_io_object<SocketService>(other.get_io_service()) + : basic_io_object<SocketService>( + other.get_service(), other.get_implementation()) { - this->get_service().template converting_move_construct<Protocol1>( - this->get_implementation(), other.get_implementation()); } /// Move-assign a basic_socket from a socket of another protocol type. |