projects
/
platform
/
upstream
/
boost.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.57.0
[platform/upstream/boost.git]
/
boost
/
asio
/
windows
/
basic_random_access_handle.hpp
diff --git
a/boost/asio/windows/basic_random_access_handle.hpp
b/boost/asio/windows/basic_random_access_handle.hpp
index
0d57141
..
22e4390
100644
(file)
--- a/
boost/asio/windows/basic_random_access_handle.hpp
+++ b/
boost/asio/windows/basic_random_access_handle.hpp
@@
-2,7
+2,7
@@
// windows/basic_random_access_handle.hpp
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//
// windows/basic_random_access_handle.hpp
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//
-// Copyright (c) 2003-201
2
Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-201
4
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)
//
// 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)
@@
-58,7
+58,7
@@
public:
/// Construct a basic_random_access_handle without opening it.
/**
* This constructor creates a random-access handle without opening it. The
/// Construct a basic_random_access_handle without opening it.
/**
* This constructor creates a random-access handle without opening it. The
- * handle needs to be opened before data can be written to or
or
read from it.
+ * handle needs to be opened before data can be written to or read from it.
*
* @param io_service The io_service object that the random-access handle will
* use to dispatch handlers for any asynchronous operations performed on the
*
* @param io_service The io_service object that the random-access handle will
* use to dispatch handlers for any asynchronous operations performed on the
@@
-156,7
+156,7
@@
public:
* std::vector.
*/
template <typename ConstBufferSequence>
* std::vector.
*/
template <typename ConstBufferSequence>
- std::size_t write_some_at(
boost::
uint64_t offset,
+ std::size_t write_some_at(uint64_t offset,
const ConstBufferSequence& buffers)
{
boost::system::error_code ec;
const ConstBufferSequence& buffers)
{
boost::system::error_code ec;
@@
-185,7
+185,7
@@
public:
* all data is written before the blocking operation completes.
*/
template <typename ConstBufferSequence>
* all data is written before the blocking operation completes.
*/
template <typename ConstBufferSequence>
- std::size_t write_some_at(
boost::
uint64_t offset,
+ std::size_t write_some_at(uint64_t offset,
const ConstBufferSequence& buffers, boost::system::error_code& ec)
{
return this->get_service().write_some_at(
const ConstBufferSequence& buffers, boost::system::error_code& ec)
{
return this->get_service().write_some_at(
@@
-230,7
+230,9
@@
public:
* std::vector.
*/
template <typename ConstBufferSequence, typename WriteHandler>
* std::vector.
*/
template <typename ConstBufferSequence, typename WriteHandler>
- void async_write_some_at(boost::uint64_t offset,
+ BOOST_ASIO_INITFN_RESULT_TYPE(WriteHandler,
+ void (boost::system::error_code, std::size_t))
+ async_write_some_at(uint64_t offset,
const ConstBufferSequence& buffers,
BOOST_ASIO_MOVE_ARG(WriteHandler) handler)
{
const ConstBufferSequence& buffers,
BOOST_ASIO_MOVE_ARG(WriteHandler) handler)
{
@@
-238,7
+240,7
@@
public:
// not meet the documented type requirements for a WriteHandler.
BOOST_ASIO_WRITE_HANDLER_CHECK(WriteHandler, handler) type_check;
// not meet the documented type requirements for a WriteHandler.
BOOST_ASIO_WRITE_HANDLER_CHECK(WriteHandler, handler) type_check;
- this->get_service().async_write_some_at(this->get_implementation(),
+
return
this->get_service().async_write_some_at(this->get_implementation(),
offset, buffers, BOOST_ASIO_MOVE_CAST(WriteHandler)(handler));
}
offset, buffers, BOOST_ASIO_MOVE_CAST(WriteHandler)(handler));
}
@@
-273,7
+275,7
@@
public:
* std::vector.
*/
template <typename MutableBufferSequence>
* std::vector.
*/
template <typename MutableBufferSequence>
- std::size_t read_some_at(
boost::
uint64_t offset,
+ std::size_t read_some_at(uint64_t offset,
const MutableBufferSequence& buffers)
{
boost::system::error_code ec;
const MutableBufferSequence& buffers)
{
boost::system::error_code ec;
@@
-303,7
+305,7
@@
public:
* completes.
*/
template <typename MutableBufferSequence>
* completes.
*/
template <typename MutableBufferSequence>
- std::size_t read_some_at(
boost::
uint64_t offset,
+ std::size_t read_some_at(uint64_t offset,
const MutableBufferSequence& buffers, boost::system::error_code& ec)
{
return this->get_service().read_some_at(
const MutableBufferSequence& buffers, boost::system::error_code& ec)
{
return this->get_service().read_some_at(
@@
-349,7
+351,9
@@
public:
* std::vector.
*/
template <typename MutableBufferSequence, typename ReadHandler>
* std::vector.
*/
template <typename MutableBufferSequence, typename ReadHandler>
- void async_read_some_at(boost::uint64_t offset,
+ BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler,
+ void (boost::system::error_code, std::size_t))
+ async_read_some_at(uint64_t offset,
const MutableBufferSequence& buffers,
BOOST_ASIO_MOVE_ARG(ReadHandler) handler)
{
const MutableBufferSequence& buffers,
BOOST_ASIO_MOVE_ARG(ReadHandler) handler)
{
@@
-357,7
+361,7
@@
public:
// not meet the documented type requirements for a ReadHandler.
BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check;
// not meet the documented type requirements for a ReadHandler.
BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check;
- this->get_service().async_read_some_at(this->get_implementation(),
+
return
this->get_service().async_read_some_at(this->get_implementation(),
offset, buffers, BOOST_ASIO_MOVE_CAST(ReadHandler)(handler));
}
};
offset, buffers, BOOST_ASIO_MOVE_CAST(ReadHandler)(handler));
}
};