Enable move support for Microsoft Visual C++ 2012.

Author: chriskohlhoff

asio/include/asio/detail/config.hpp

@@ -97,6 +97,11 @@
 #    endif // defined(__GXX_EXPERIMENTAL_CXX0X__)
 #   endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ > 4)
 #  endif // defined(__GNUC__)
+#  if defined(ASIO_MSVC)
+#   if (_MSC_VER >= 1700)
+#    define ASIO_HAS_MOVE 1
+#   endif // (_MSC_VER >= 1700)
+#  endif // defined(ASIO_MSVC)
 # endif // !defined(ASIO_DISABLE_MOVE)
 #endif // !defined(ASIO_HAS_MOVE)
 

asio/include/asio/detail/win_iocp_socket_service.hpp

@@ -165,6 +165,24 @@ class win_iocp_socket_service : public win_iocp_socket_service_base
     other_impl.remote_endpoint_ = endpoint_type();
   }
 
+  // Move-construct a new socket implementation from another protocol type.
+  template <typename Protocol1>
+  void converting_move_construct(implementation_type& impl,
+      typename win_iocp_socket_service<
+        Protocol1>::implementation_type& other_impl)
+  {
+    this->base_move_construct(impl, other_impl);
+
+    impl.protocol_ = protocol_type(other_impl.protocol_);
+    other_impl.protocol_ = typename Protocol1::endpoint().protocol();
+
+    impl.have_remote_endpoint_ = other_impl.have_remote_endpoint_;
+    other_impl.have_remote_endpoint_ = false;
+
+    impl.remote_endpoint_ = other_impl.remote_endpoint_;
+    other_impl.remote_endpoint_ = typename Protocol1::endpoint();
+  }
+
   // Open a new socket implementation.
   asio::error_code open(implementation_type& impl,
       const protocol_type& protocol, asio::error_code& ec)

asio/src/tests/unit/generic/datagram_protocol.cpp

@@ -79,7 +79,8 @@ void test()
 
 #if defined(ASIO_HAS_MOVE)
     dp::socket socket5(std::move(socket4));
-    dp::socket socket6(asio::ip::udp::socket(ios));
+    asio::ip::udp::socket udp_socket(ios);
+    dp::socket socket6(std::move(udp_socket));
 #endif // defined(ASIO_HAS_MOVE)
 
     // basic_datagram_socket operators.

asio/src/tests/unit/generic/raw_protocol.cpp

@@ -79,7 +79,8 @@ void test()
 
 #if defined(ASIO_HAS_MOVE)
     rp::socket socket5(std::move(socket4));
-    rp::socket socket6(asio::ip::icmp::socket(ios));
+    asio::ip::icmp::socket icmp_socket(ios);
+    rp::socket socket6(std::move(icmp_socket));
 #endif // defined(ASIO_HAS_MOVE)
 
     // basic_datagram_socket operators.

asio/src/tests/unit/generic/stream_protocol.cpp

@@ -89,7 +89,8 @@ void test()
 
 #if defined(ASIO_HAS_MOVE)
     sp::socket socket5(std::move(socket4));
-    sp::socket socket6(asio::ip::tcp::socket(ios));
+    asio::ip::tcp::socket tcp_socket(ios);
+    sp::socket socket6(std::move(tcp_socket));
 #endif // defined(ASIO_HAS_MOVE)
 
     // basic_stream_socket operators.

asio/src/tests/unit/ip/tcp.cpp

@@ -203,7 +203,7 @@ void test()
 #endif // !defined(ASIO_WINDOWS_RUNTIME)
 
 #if defined(ASIO_HAS_MOVE)
-    ip::tcp::socket socket7(std::move(socket6));
+    ip::tcp::socket socket7(std::move(socket5));
 #endif // defined(ASIO_HAS_MOVE)
 
     // basic_stream_socket operators.
@@ -662,7 +662,7 @@ void test()
 #endif // !defined(ASIO_WINDOWS_RUNTIME)
 
 #if defined(ASIO_HAS_MOVE)
-    ip::tcp::acceptor acceptor7(std::move(acceptor6));
+    ip::tcp::acceptor acceptor7(std::move(acceptor5));
 #endif // defined(ASIO_HAS_MOVE)
 
     // basic_socket_acceptor operators.