diff options
author | Remko Tronçon <git@el-tramo.be> | 2010-05-06 17:44:27 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2010-05-06 17:44:27 (GMT) |
commit | d76ada0ab59634e3333f9eb5a92d0e850f60d7bf (patch) | |
tree | 5eaae441173fad2ec19ba67d6589f28ecd740991 /3rdParty/Boost/src/boost/asio/basic_socket_streambuf.hpp | |
parent | 6f49e5abee37d37b351d68c01374232eccdac458 (diff) | |
download | swift-contrib-d76ada0ab59634e3333f9eb5a92d0e850f60d7bf.zip swift-contrib-d76ada0ab59634e3333f9eb5a92d0e850f60d7bf.tar.bz2 |
Updated Boost to 1.43.0.
Diffstat (limited to '3rdParty/Boost/src/boost/asio/basic_socket_streambuf.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/asio/basic_socket_streambuf.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/3rdParty/Boost/src/boost/asio/basic_socket_streambuf.hpp b/3rdParty/Boost/src/boost/asio/basic_socket_streambuf.hpp index 9e96401..695e8e1 100644 --- a/3rdParty/Boost/src/boost/asio/basic_socket_streambuf.hpp +++ b/3rdParty/Boost/src/boost/asio/basic_socket_streambuf.hpp @@ -50,7 +50,8 @@ // init_buffers(); // boost::system::error_code ec; // this->basic_socket<Protocol, StreamSocketService>::close(ec); -// typedef typename Protocol::resolver_query resolver_query; +// typedef typename Protocol::resolver resolver_type; +// typedef typename resolver_type::query resolver_query; // resolver_query query(x1, ..., xn); // resolve_and_connect(query, ec); // return !ec ? this : 0; @@ -65,7 +66,8 @@ init_buffers(); \ boost::system::error_code ec; \ this->basic_socket<Protocol, StreamSocketService>::close(ec); \ - typedef typename Protocol::resolver_query resolver_query; \ + typedef typename Protocol::resolver resolver_type; \ + typedef typename resolver_type::query resolver_query; \ resolver_query query(BOOST_PP_ENUM_PARAMS(n, x)); \ resolve_and_connect(query, ec); \ return !ec ? this : 0; \ @@ -259,7 +261,7 @@ private: boost::system::error_code& ec) { typedef typename Protocol::resolver resolver_type; - typedef typename Protocol::resolver_iterator iterator_type; + typedef typename resolver_type::iterator iterator_type; resolver_type resolver( boost::base_from_member<boost::asio::io_service>::member); iterator_type i = resolver.resolve(query, ec); |