summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-04-11 18:19:17 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-04-11 19:20:07 (GMT)
commit857e44c156a1dbefcb49bb5792c4384cebd8762a (patch)
tree11947fb81ad9c502627f1b2bb8f090fb8d53c107 /3rdParty/Boost/src/boost/asio/impl/write_at.ipp
parent77d4eb7588e113beaa03f3347523b26adefdeb06 (diff)
downloadswift-857e44c156a1dbefcb49bb5792c4384cebd8762a.zip
swift-857e44c156a1dbefcb49bb5792c4384cebd8762a.tar.bz2
Updated Boost to 1.42.
Diffstat (limited to '3rdParty/Boost/src/boost/asio/impl/write_at.ipp')
-rw-r--r--3rdParty/Boost/src/boost/asio/impl/write_at.ipp22
1 files changed, 15 insertions, 7 deletions
diff --git a/3rdParty/Boost/src/boost/asio/impl/write_at.ipp b/3rdParty/Boost/src/boost/asio/impl/write_at.ipp
index ba00567..751229b 100644
--- a/3rdParty/Boost/src/boost/asio/impl/write_at.ipp
+++ b/3rdParty/Boost/src/boost/asio/impl/write_at.ipp
@@ -2,7 +2,7 @@
// write_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)
@@ -76,6 +76,8 @@ inline std::size_t write_at(SyncRandomAccessWriteDevice& d,
return bytes_transferred;
}
+#if !defined(BOOST_NO_IOSTREAM)
+
template <typename SyncRandomAccessWriteDevice, typename Allocator,
typename CompletionCondition>
std::size_t write_at(SyncRandomAccessWriteDevice& d,
@@ -111,6 +113,8 @@ inline std::size_t write_at(SyncRandomAccessWriteDevice& d,
return bytes_transferred;
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
namespace detail
{
template <typename AsyncRandomAccessWriteDevice, typename ConstBufferSequence,
@@ -167,7 +171,7 @@ namespace detail
CompletionCondition, WriteHandler>* this_handler)
{
return boost_asio_handler_alloc_helpers::allocate(
- size, &this_handler->handler_);
+ size, this_handler->handler_);
}
template <typename AsyncRandomAccessWriteDevice, typename ConstBufferSequence,
@@ -177,7 +181,7 @@ namespace detail
CompletionCondition, WriteHandler>* this_handler)
{
boost_asio_handler_alloc_helpers::deallocate(
- pointer, size, &this_handler->handler_);
+ pointer, size, this_handler->handler_);
}
template <typename Function, typename AsyncRandomAccessWriteDevice,
@@ -188,7 +192,7 @@ namespace detail
CompletionCondition, WriteHandler>* this_handler)
{
boost_asio_handler_invoke_helpers::invoke(
- function, &this_handler->handler_);
+ function, this_handler->handler_);
}
} // namespace detail
@@ -227,6 +231,8 @@ inline void async_write_at(AsyncRandomAccessWriteDevice& d,
async_write_at(d, offset, buffers, transfer_all(), handler);
}
+#if !defined(BOOST_NO_IOSTREAM)
+
namespace detail
{
template <typename AsyncRandomAccessWriteDevice, typename Allocator,
@@ -261,7 +267,7 @@ namespace detail
Allocator, WriteHandler>* this_handler)
{
return boost_asio_handler_alloc_helpers::allocate(
- size, &this_handler->handler_);
+ size, this_handler->handler_);
}
template <typename AsyncRandomAccessWriteDevice, typename Allocator,
@@ -271,7 +277,7 @@ namespace detail
Allocator, WriteHandler>* this_handler)
{
boost_asio_handler_alloc_helpers::deallocate(
- pointer, size, &this_handler->handler_);
+ pointer, size, this_handler->handler_);
}
template <typename Function, typename AsyncRandomAccessWriteDevice,
@@ -281,7 +287,7 @@ namespace detail
Allocator, WriteHandler>* this_handler)
{
boost_asio_handler_invoke_helpers::invoke(
- function, &this_handler->handler_);
+ function, this_handler->handler_);
}
} // namespace detail
@@ -305,6 +311,8 @@ inline void async_write_at(AsyncRandomAccessWriteDevice& d,
async_write_at(d, offset, b, transfer_all(), handler);
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
} // namespace asio
} // namespace boost