diff options
Diffstat (limited to 'libs/asio/test/ip/tcp.cpp')
| -rw-r--r-- | libs/asio/test/ip/tcp.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/libs/asio/test/ip/tcp.cpp b/libs/asio/test/ip/tcp.cpp index e8e13e5c6..dd5e033a9 100644 --- a/libs/asio/test/ip/tcp.cpp +++ b/libs/asio/test/ip/tcp.cpp @@ -2,7 +2,7 @@ // tcp.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) @@ -198,7 +198,8 @@ void test() ip::tcp::socket socket4(ios, ip::tcp::endpoint(ip::tcp::v4(), 0)); ip::tcp::socket socket5(ios, ip::tcp::endpoint(ip::tcp::v6(), 0)); #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - int native_socket1 = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ip::tcp::socket::native_handle_type native_socket1 + = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ip::tcp::socket socket6(ios, ip::tcp::v4(), native_socket1); #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) @@ -234,9 +235,11 @@ void test() socket1.open(ip::tcp::v6(), ec); #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - int native_socket2 = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ip::tcp::socket::native_handle_type native_socket2 + = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); socket1.assign(ip::tcp::v4(), native_socket2); - int native_socket3 = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ip::tcp::socket::native_handle_type native_socket3 + = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); socket1.assign(ip::tcp::v4(), native_socket3, ec); #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) @@ -657,7 +660,8 @@ void test() ip::tcp::acceptor acceptor4(ios, ip::tcp::endpoint(ip::tcp::v4(), 0)); ip::tcp::acceptor acceptor5(ios, ip::tcp::endpoint(ip::tcp::v6(), 0)); #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - int native_acceptor1 = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ip::tcp::acceptor::native_handle_type native_acceptor1 + = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ip::tcp::acceptor acceptor6(ios, ip::tcp::v4(), native_acceptor1); #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) @@ -685,9 +689,11 @@ void test() acceptor1.open(ip::tcp::v6(), ec); #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - int native_acceptor2 = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ip::tcp::acceptor::native_handle_type native_acceptor2 + = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); acceptor1.assign(ip::tcp::v4(), native_acceptor2); - int native_acceptor3 = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ip::tcp::acceptor::native_handle_type native_acceptor3 + = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); acceptor1.assign(ip::tcp::v4(), native_acceptor3, ec); #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) |