Imported from /home/lorry/working-area/delta_boost-tarball/boost_1_58_0.tar.bz2.HEADboost_1_58_0master

1 files changed, 7 insertions, 4 deletions

diff --git a/libs/asio/test/generic/seq_packet_protocol.cpp b/libs/asio/test/generic/seq_packet_protocol.cpp
index c32d2b8b1..8f126e032 100644
--- a/libs/asio/test/generic/seq_packet_protocol.cpp
+++ b/libs/asio/test/generic/seq_packet_protocol.cpp
@@ -2,7 +2,7 @@
 // generic/seq_packet_protocol.cpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2014 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2015 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)
@@ -72,7 +72,8 @@ void test()
     spp::socket socket2(ios, spp(af_inet, 0));
     spp::socket socket3(ios, spp::endpoint());
 #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-    int native_socket1 = ::socket(af_inet, sock_seqpacket, 0);
+    spp::socket::native_handle_type native_socket1
+      = ::socket(af_inet, sock_seqpacket, 0);
     spp::socket socket4(ios, spp(af_inet, 0), native_socket1);
 #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
 
@@ -101,9 +102,11 @@ void test()
     socket1.open(spp(af_inet, 0), ec);
 
 #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-    int native_socket2 = ::socket(af_inet, sock_seqpacket, 0);
+    spp::socket::native_handle_type native_socket2
+      = ::socket(af_inet, sock_seqpacket, 0);
     socket1.assign(spp(af_inet, 0), native_socket2);
-    int native_socket3 = ::socket(af_inet, sock_seqpacket, 0);
+    spp::socket::native_handle_type native_socket3
+      = ::socket(af_inet, sock_seqpacket, 0);
     socket1.assign(spp(af_inet, 0), native_socket3, ec);
 #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)