diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-04-08 03:09:47 +0000 |
|---|---|---|
| committer | <> | 2015-05-05 14:37:32 +0000 |
| commit | f2541bb90af059680aa7036f315f052175999355 (patch) | |
| tree | a5b214744b256f07e1dc2bd7273035a7808c659f /libs/asio/test/generic/stream_protocol.cpp | |
| parent | ed232fdd34968697a68783b3195b1da4226915b5 (diff) | |
| download | boost-tarball-master.tar.gz | |
Imported from /home/lorry/working-area/delta_boost-tarball/boost_1_58_0.tar.bz2.HEADboost_1_58_0master
Diffstat (limited to 'libs/asio/test/generic/stream_protocol.cpp')
| -rw-r--r-- | libs/asio/test/generic/stream_protocol.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libs/asio/test/generic/stream_protocol.cpp b/libs/asio/test/generic/stream_protocol.cpp index ec89e95ac..40720ac8c 100644 --- a/libs/asio/test/generic/stream_protocol.cpp +++ b/libs/asio/test/generic/stream_protocol.cpp @@ -2,7 +2,7 @@ // generic/stream_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) @@ -83,7 +83,8 @@ void test() #if defined(BOOST_ASIO_WINDOWS_RUNTIME) Windows::Networking::Sockets::StreamSocket^ native_socket1 = nullptr; #else // defined(BOOST_ASIO_WINDOWS_RUNTIME) - int native_socket1 = ::socket(af_inet, sock_stream, 0); + sp::socket::native_handle_type native_socket1 + = ::socket(af_inet, sock_stream, 0); #endif // defined(BOOST_ASIO_WINDOWS_RUNTIME) sp::socket socket4(ios, sp(af_inet, ipproto_tcp), native_socket1); @@ -117,13 +118,15 @@ void test() #if defined(BOOST_ASIO_WINDOWS_RUNTIME) Windows::Networking::Sockets::StreamSocket^ native_socket2 = nullptr; #else // defined(BOOST_ASIO_WINDOWS_RUNTIME) - int native_socket2 = ::socket(af_inet, sock_stream, 0); + sp::socket::native_handle_type native_socket2 + = ::socket(af_inet, sock_stream, 0); #endif // defined(BOOST_ASIO_WINDOWS_RUNTIME) socket1.assign(sp(af_inet, ipproto_tcp), native_socket2); #if defined(BOOST_ASIO_WINDOWS_RUNTIME) Windows::Networking::Sockets::StreamSocket^ native_socket3 = nullptr; #else // defined(BOOST_ASIO_WINDOWS_RUNTIME) - int native_socket3 = ::socket(af_inet, sock_stream, 0); + sp::socket::native_handle_type native_socket3 + = ::socket(af_inet, sock_stream, 0); #endif // defined(BOOST_ASIO_WINDOWS_RUNTIME) socket1.assign(sp(af_inet, ipproto_tcp), native_socket3, ec); |