summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/asio/impl/read_at.ipp')
-rw-r--r--3rdParty/Boost/src/boost/asio/impl/read_at.ipp22
1 files changed, 15 insertions, 7 deletions
diff --git a/3rdParty/Boost/src/boost/asio/impl/read_at.ipp b/3rdParty/Boost/src/boost/asio/impl/read_at.ipp
index bf8a36d..91fd014 100644
--- a/3rdParty/Boost/src/boost/asio/impl/read_at.ipp
+++ b/3rdParty/Boost/src/boost/asio/impl/read_at.ipp
@@ -2,7 +2,7 @@
// read_at.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)
@@ -81,6 +81,8 @@ inline std::size_t read_at(SyncRandomAccessReadDevice& d,
return bytes_transferred;
}
+#if !defined(BOOST_NO_IOSTREAM)
+
template <typename SyncRandomAccessReadDevice, typename Allocator,
typename CompletionCondition>
std::size_t read_at(SyncRandomAccessReadDevice& d,
@@ -126,6 +128,8 @@ inline std::size_t read_at(SyncRandomAccessReadDevice& d,
return bytes_transferred;
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
namespace detail
{
template <typename AsyncRandomAccessReadDevice,
@@ -184,7 +188,7 @@ namespace detail
CompletionCondition, ReadHandler>* this_handler)
{
return boost_asio_handler_alloc_helpers::allocate(
- size, &this_handler->handler_);
+ size, this_handler->handler_);
}
template <typename AsyncRandomAccessReadDevice,
@@ -195,7 +199,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 AsyncRandomAccessReadDevice,
@@ -206,7 +210,7 @@ namespace detail
CompletionCondition, ReadHandler>* this_handler)
{
boost_asio_handler_invoke_helpers::invoke(
- function, &this_handler->handler_);
+ function, this_handler->handler_);
}
} // namespace detail
@@ -245,6 +249,8 @@ inline void async_read_at(AsyncRandomAccessReadDevice& d,
async_read_at(d, offset, buffers, transfer_all(), handler);
}
+#if !defined(BOOST_NO_IOSTREAM)
+
namespace detail
{
template <typename AsyncRandomAccessReadDevice, typename Allocator,
@@ -301,7 +307,7 @@ namespace detail
CompletionCondition, ReadHandler>* this_handler)
{
return boost_asio_handler_alloc_helpers::allocate(
- size, &this_handler->handler_);
+ size, this_handler->handler_);
}
template <typename AsyncRandomAccessReadDevice, typename Allocator,
@@ -311,7 +317,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 AsyncRandomAccessReadDevice,
@@ -321,7 +327,7 @@ namespace detail
CompletionCondition, ReadHandler>* this_handler)
{
boost_asio_handler_invoke_helpers::invoke(
- function, &this_handler->handler_);
+ function, this_handler->handler_);
}
} // namespace detail
@@ -359,6 +365,8 @@ inline void async_read_at(AsyncRandomAccessReadDevice& d,
async_read_at(d, offset, b, transfer_all(), handler);
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
} // namespace asio
} // namespace boost