Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/asio/windows/basic_random_access_handle.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/asio/windows/basic_random_access_handle.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/asio/windows/basic_random_access_handle.hpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/3rdParty/Boost/src/boost/asio/windows/basic_random_access_handle.hpp b/3rdParty/Boost/src/boost/asio/windows/basic_random_access_handle.hpp index 0d57141..22e4390 100644 --- a/3rdParty/Boost/src/boost/asio/windows/basic_random_access_handle.hpp +++ b/3rdParty/Boost/src/boost/asio/windows/basic_random_access_handle.hpp @@ -2,7 +2,7 @@ // windows/basic_random_access_handle.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2012 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2014 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) @@ -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 - * 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 @@ -156,7 +156,7 @@ public: * 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; @@ -185,7 +185,7 @@ public: * 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( @@ -230,7 +230,9 @@ public: * 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) { @@ -238,7 +240,7 @@ public: // 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)); } @@ -273,7 +275,7 @@ public: * 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; @@ -303,7 +305,7 @@ public: * 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( @@ -349,7 +351,9 @@ public: * 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) { @@ -357,7 +361,7 @@ public: // 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)); } }; |