Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-04-11 18:19:17 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-04-11 19:20:07 (GMT) |
| commit | 857e44c156a1dbefcb49bb5792c4384cebd8762a (patch) | |
| tree | 11947fb81ad9c502627f1b2bb8f090fb8d53c107 /3rdParty/Boost/src/boost/asio/impl/read.ipp | |
| parent | 77d4eb7588e113beaa03f3347523b26adefdeb06 (diff) | |
| download | swift-contrib-857e44c156a1dbefcb49bb5792c4384cebd8762a.zip swift-contrib-857e44c156a1dbefcb49bb5792c4384cebd8762a.tar.bz2 | |
Updated Boost to 1.42.
Diffstat (limited to '3rdParty/Boost/src/boost/asio/impl/read.ipp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/asio/impl/read.ipp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/3rdParty/Boost/src/boost/asio/impl/read.ipp b/3rdParty/Boost/src/boost/asio/impl/read.ipp index 453f697..05ea960 100644 --- a/3rdParty/Boost/src/boost/asio/impl/read.ipp +++ b/3rdParty/Boost/src/boost/asio/impl/read.ipp @@ -2,7 +2,7 @@ // read.ipp // ~~~~~~~~ // -// Copyright (c) 2003-2008 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2010 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) @@ -75,6 +75,8 @@ inline std::size_t read(SyncReadStream& s, const MutableBufferSequence& buffers, return bytes_transferred; } +#if !defined(BOOST_NO_IOSTREAM) + template <typename SyncReadStream, typename Allocator, typename CompletionCondition> std::size_t read(SyncReadStream& s, @@ -122,6 +124,8 @@ inline std::size_t read(SyncReadStream& s, return bytes_transferred; } +#endif // !defined(BOOST_NO_IOSTREAM) + namespace detail { template <typename AsyncReadStream, typename MutableBufferSequence, @@ -174,7 +178,7 @@ namespace detail CompletionCondition, ReadHandler>* this_handler) { return boost_asio_handler_alloc_helpers::allocate( - size, &this_handler->handler_); + size, this_handler->handler_); } template <typename AsyncReadStream, typename MutableBufferSequence, @@ -184,7 +188,7 @@ namespace detail CompletionCondition, ReadHandler>* this_handler) { boost_asio_handler_alloc_helpers::deallocate( - pointer, size, &this_handler->handler_); + pointer, size, this_handler->handler_); } template <typename Function, typename AsyncReadStream, @@ -195,7 +199,7 @@ namespace detail CompletionCondition, ReadHandler>* this_handler) { boost_asio_handler_invoke_helpers::invoke( - function, &this_handler->handler_); + function, this_handler->handler_); } } // namespace detail @@ -232,6 +236,8 @@ inline void async_read(AsyncReadStream& s, const MutableBufferSequence& buffers, async_read(s, buffers, transfer_all(), handler); } +#if !defined(BOOST_NO_IOSTREAM) + namespace detail { template <typename AsyncReadStream, typename Allocator, @@ -285,7 +291,7 @@ namespace detail CompletionCondition, ReadHandler>* this_handler) { return boost_asio_handler_alloc_helpers::allocate( - size, &this_handler->handler_); + size, this_handler->handler_); } template <typename AsyncReadStream, typename Allocator, @@ -295,7 +301,7 @@ namespace detail CompletionCondition, ReadHandler>* this_handler) { boost_asio_handler_alloc_helpers::deallocate( - pointer, size, &this_handler->handler_); + pointer, size, this_handler->handler_); } template <typename Function, typename AsyncReadStream, @@ -305,7 +311,7 @@ namespace detail CompletionCondition, ReadHandler>* this_handler) { boost_asio_handler_invoke_helpers::invoke( - function, &this_handler->handler_); + function, this_handler->handler_); } } // namespace detail @@ -341,6 +347,8 @@ inline void async_read(AsyncReadStream& s, async_read(s, b, transfer_all(), handler); } +#endif // !defined(BOOST_NO_IOSTREAM) + } // namespace asio } // namespace boost |