diff options
author | Remko Tronçon <git@el-tramo.be> | 2012-12-23 13:16:26 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2012-12-23 14:43:26 (GMT) |
commit | 491ddd570a752cf9bda85933bed0c6942e39b1f9 (patch) | |
tree | 10c25c1be8cc08d0497df1dccd56a10fbb30beee /3rdParty/Boost/src/boost/asio/socket_base.hpp | |
parent | da7d7a0ca71b80281aa9ff2526290b61ccb0cc60 (diff) | |
download | swift-491ddd570a752cf9bda85933bed0c6942e39b1f9.zip swift-491ddd570a752cf9bda85933bed0c6942e39b1f9.tar.bz2 |
Update Boost to 1.52.0.
Change-Id: I1e56bea2600bf2ed9c5b3aba8c4f9d2a0f350e77
Diffstat (limited to '3rdParty/Boost/src/boost/asio/socket_base.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/asio/socket_base.hpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/asio/socket_base.hpp b/3rdParty/Boost/src/boost/asio/socket_base.hpp index f5bac91..f964d00 100644 --- a/3rdParty/Boost/src/boost/asio/socket_base.hpp +++ b/3rdParty/Boost/src/boost/asio/socket_base.hpp @@ -2,7 +2,7 @@ // socket_base.hpp // ~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2011 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2012 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) @@ -63,6 +63,9 @@ public: /// Specify that the data should not be subject to routing. static const int message_do_not_route = implementation_defined; + + /// Specifies that the data marks the end of a record. + static const int message_end_of_record = implementation_defined; #else BOOST_STATIC_CONSTANT(int, message_peek = boost::asio::detail::message_peek); @@ -70,6 +73,8 @@ public: message_out_of_band = boost::asio::detail::message_out_of_band); BOOST_STATIC_CONSTANT(int, message_do_not_route = boost::asio::detail::message_do_not_route); + BOOST_STATIC_CONSTANT(int, + message_end_of_record = boost::asio::detail::message_end_of_record); #endif /// Socket option to permit sending of broadcast messages. @@ -442,7 +447,8 @@ public: enable_connection_aborted; #endif - /// IO control command to set the blocking mode of the socket. + /// (Deprecated: Use non_blocking().) IO control command to + /// set the blocking mode of the socket. /** * Implements the FIONBIO IO control command. * |