Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/asio/read_until.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/asio/read_until.hpp | 49 |
1 files changed, 34 insertions, 15 deletions
diff --git a/3rdParty/Boost/src/boost/asio/read_until.hpp b/3rdParty/Boost/src/boost/asio/read_until.hpp index 1f1bddb..a351604 100644 --- a/3rdParty/Boost/src/boost/asio/read_until.hpp +++ b/3rdParty/Boost/src/boost/asio/read_until.hpp @@ -3,5 +3,5 @@ // ~~~~~~~~~~~~~~ // -// 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 @@ -18,14 +18,12 @@ #include <boost/asio/detail/config.hpp> -#if !defined(BOOST_NO_IOSTREAM) +#if !defined(BOOST_ASIO_NO_IOSTREAM) #include <cstddef> -#include <boost/type_traits/is_function.hpp> -#include <boost/type_traits/remove_pointer.hpp> -#include <boost/utility/enable_if.hpp> -#include <boost/detail/workaround.hpp> #include <string> +#include <boost/asio/async_result.hpp> #include <boost/asio/basic_streambuf.hpp> #include <boost/asio/detail/regex_fwd.hpp> +#include <boost/asio/detail/type_traits.hpp> #include <boost/asio/error.hpp> @@ -60,5 +58,6 @@ struct is_match_condition enum { - value = boost::is_function<typename boost::remove_pointer<T>::type>::value + value = boost::asio::is_function< + typename boost::asio::remove_pointer<T>::type>::value || detail::has_result_type<T>::value }; @@ -248,4 +247,7 @@ std::size_t read_until(SyncReadStream& s, boost::system::error_code& ec); +#if defined(BOOST_ASIO_HAS_BOOST_REGEX) \ + || defined(GENERATING_DOCUMENTATION) + /// Read data into a streambuf until some part of the data it contains matches /// a regular expression. @@ -340,4 +342,7 @@ std::size_t read_until(SyncReadStream& s, boost::system::error_code& ec); +#endif // defined(BOOST_ASIO_HAS_BOOST_REGEX) + // || defined(GENERATING_DOCUMENTATION) + /// Read data into a streambuf until a function object indicates a match. /** @@ -442,5 +447,5 @@ template <typename SyncReadStream, typename Allocator, typename MatchCondition> std::size_t read_until(SyncReadStream& s, boost::asio::basic_streambuf<Allocator>& b, MatchCondition match_condition, - typename boost::enable_if<is_match_condition<MatchCondition> >::type* = 0); + typename enable_if<is_match_condition<MatchCondition>::value>::type* = 0); /// Read data into a streambuf until a function object indicates a match. @@ -498,5 +503,5 @@ std::size_t read_until(SyncReadStream& s, boost::asio::basic_streambuf<Allocator>& b, MatchCondition match_condition, boost::system::error_code& ec, - typename boost::enable_if<is_match_condition<MatchCondition> >::type* = 0); + typename enable_if<is_match_condition<MatchCondition>::value>::type* = 0); /*@}*/ @@ -589,5 +594,7 @@ std::size_t read_until(SyncReadStream& s, */ template <typename AsyncReadStream, typename Allocator, typename ReadHandler> -void async_read_until(AsyncReadStream& s, +BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, + void (boost::system::error_code, std::size_t)) +async_read_until(AsyncReadStream& s, boost::asio::basic_streambuf<Allocator>& b, char delim, BOOST_ASIO_MOVE_ARG(ReadHandler) handler); @@ -672,8 +679,13 @@ void async_read_until(AsyncReadStream& s, */ template <typename AsyncReadStream, typename Allocator, typename ReadHandler> -void async_read_until(AsyncReadStream& s, +BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, + void (boost::system::error_code, std::size_t)) +async_read_until(AsyncReadStream& s, boost::asio::basic_streambuf<Allocator>& b, const std::string& delim, BOOST_ASIO_MOVE_ARG(ReadHandler) handler); +#if defined(BOOST_ASIO_HAS_BOOST_REGEX) \ + || defined(GENERATING_DOCUMENTATION) + /// Start an asynchronous operation to read data into a streambuf until some /// part of its data matches a regular expression. @@ -759,8 +771,13 @@ void async_read_until(AsyncReadStream& s, */ template <typename AsyncReadStream, typename Allocator, typename ReadHandler> -void async_read_until(AsyncReadStream& s, +BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, + void (boost::system::error_code, std::size_t)) +async_read_until(AsyncReadStream& s, boost::asio::basic_streambuf<Allocator>& b, const boost::regex& expr, BOOST_ASIO_MOVE_ARG(ReadHandler) handler); +#endif // defined(BOOST_ASIO_HAS_BOOST_REGEX) + // || defined(GENERATING_DOCUMENTATION) + /// Start an asynchronous operation to read data into a streambuf until a /// function object indicates a match. @@ -888,8 +905,10 @@ void async_read_until(AsyncReadStream& s, template <typename AsyncReadStream, typename Allocator, typename MatchCondition, typename ReadHandler> -void async_read_until(AsyncReadStream& s, +BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, + void (boost::system::error_code, std::size_t)) +async_read_until(AsyncReadStream& s, boost::asio::basic_streambuf<Allocator>& b, MatchCondition match_condition, BOOST_ASIO_MOVE_ARG(ReadHandler) handler, - typename boost::enable_if<is_match_condition<MatchCondition> >::type* = 0); + typename enable_if<is_match_condition<MatchCondition>::value>::type* = 0); /*@}*/ @@ -902,5 +921,5 @@ void async_read_until(AsyncReadStream& s, #include <boost/asio/impl/read_until.hpp> -#endif // !defined(BOOST_NO_IOSTREAM) +#endif // !defined(BOOST_ASIO_NO_IOSTREAM) #endif // BOOST_ASIO_READ_UNTIL_HPP |