AuroraMiddleware/asio
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mark basic_streambuf, regex, and match condition overloads as extensions.

Browse Source
This commit is contained in:
Christopher Kohlhoff 2016-09-04 13:42:16 +10:00
parent 14676ca0a0
commit 348e4bd236
10 changed files with 60 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asio/include/asio/impl/read.hpp
View File

@ -183,6 +183,7 @@ inline std::size_t read(SyncReadStream& s,
return bytes_transferred;
}
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
template <typename SyncReadStream, typename Allocator,
@ -219,6 +220,7 @@ inline std::size_t read(SyncReadStream& s,
}
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
namespace detail
{
@ -678,6 +680,7 @@ async_read(AsyncReadStream& s,
return init.result.get();
}
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
template <typename AsyncReadStream, typename Allocator, typename ReadHandler>
@ -703,6 +706,7 @@ async_read(AsyncReadStream& s, basic_streambuf<Allocator>& b,
}
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
} // namespace asio

4
asio/include/asio/impl/read_at.hpp
View File

@ -105,6 +105,7 @@ inline std::size_t read_at(SyncRandomAccessReadDevice& d,
return bytes_transferred;
}
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
template <typename SyncRandomAccessReadDevice, typename Allocator,
@ -164,6 +165,7 @@ inline std::size_t read_at(SyncRandomAccessReadDevice& d,
}
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
namespace detail
{
@ -402,6 +404,7 @@ async_read_at(AsyncRandomAccessReadDevice& d,
return init.result.get();
}
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
namespace detail
@ -628,6 +631,7 @@ async_read_at(AsyncRandomAccessReadDevice& d,
}
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
} // namespace asio

4
asio/include/asio/impl/read_until.hpp
View File

@ -202,6 +202,7 @@ std::size_t read_until(SyncReadStream& s,
}
}
#if !defined(ASIO_NO_EXTENSIONS)
#if defined(ASIO_HAS_BOOST_REGEX)
template <typename SyncReadStream, typename DynamicBufferSequence>
@ -418,6 +419,7 @@ inline std::size_t read_until(SyncReadStream& s,
}
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
namespace detail
{
@ -914,6 +916,7 @@ async_read_until(AsyncReadStream& s,
return init.result.get();
}
#if !defined(ASIO_NO_EXTENSIONS)
#if defined(ASIO_HAS_BOOST_REGEX)
namespace detail
@ -1484,6 +1487,7 @@ async_read_until(AsyncReadStream& s,
}
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
} // namespace asio

4
asio/include/asio/impl/write.hpp
View File

@ -166,6 +166,7 @@ inline std::size_t write(SyncWriteStream& s,
return bytes_transferred;
}
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
template <typename SyncWriteStream, typename Allocator,
@ -202,6 +203,7 @@ inline std::size_t write(SyncWriteStream& s,
}
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
namespace detail
{
@ -635,6 +637,7 @@ async_write(AsyncWriteStream& s,
return init.result.get();
}
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
template <typename AsyncWriteStream, typename Allocator, typename WriteHandler>
@ -662,6 +665,7 @@ async_write(AsyncWriteStream& s,
}
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
} // namespace asio

4
asio/include/asio/impl/write_at.hpp
View File

@ -103,6 +103,7 @@ inline std::size_t write_at(SyncRandomAccessWriteDevice& d,
return bytes_transferred;
}
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
template <typename SyncRandomAccessWriteDevice, typename Allocator,
@ -149,6 +150,7 @@ inline std::size_t write_at(SyncRandomAccessWriteDevice& d,
}
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
namespace detail
{
@ -387,6 +389,7 @@ async_write_at(AsyncRandomAccessWriteDevice& d,
return init.result.get();
}
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
namespace detail
@ -560,6 +563,7 @@ async_write_at(AsyncRandomAccessWriteDevice& d,
}
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
} // namespace asio

9
asio/include/asio/read.hpp
View File

@ -18,10 +18,13 @@
#include "asio/detail/config.hpp"
#include <cstddef>
#include "asio/async_result.hpp"
#include "asio/basic_streambuf_fwd.hpp"
#include "asio/buffer.hpp"
#include "asio/error.hpp"
#if !defined(ASIO_NO_EXTENSIONS)
# include "asio/basic_streambuf_fwd.hpp"
#endif // !defined(ASIO_NO_EXTENSIONS)
#include "asio/detail/push_options.hpp"
namespace asio {
@ -379,6 +382,7 @@ std::size_t read(SyncReadStream& s,
is_dynamic_buffer_sequence<DynamicBufferSequence>::value
>::type* = 0);
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
/// Attempt to read a certain amount of data from a stream before returning.
@ -522,6 +526,7 @@ std::size_t read(SyncReadStream& s, basic_streambuf<Allocator>& b,
CompletionCondition completion_condition, asio::error_code& ec);
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
/*@}*/
/**
@ -807,6 +812,7 @@ async_read(AsyncReadStream& s,
is_dynamic_buffer_sequence<DynamicBufferSequence>::value
>::type* = 0);
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
/// Start an asynchronous operation to read a certain amount of data from a
@ -928,6 +934,7 @@ async_read(AsyncReadStream& s, basic_streambuf<Allocator>& b,
ASIO_MOVE_ARG(ReadHandler) handler);
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
/*@}*/

9
asio/include/asio/read_at.hpp
View File

@ -18,10 +18,13 @@
#include "asio/detail/config.hpp"
#include <cstddef>
#include "asio/async_result.hpp"
#include "asio/basic_streambuf_fwd.hpp"
#include "asio/detail/cstdint.hpp"
#include "asio/error.hpp"
#if !defined(ASIO_NO_EXTENSIONS)
# include "asio/basic_streambuf_fwd.hpp"
#endif // !defined(ASIO_NO_EXTENSIONS)
#include "asio/detail/push_options.hpp"
namespace asio {
@ -229,6 +232,7 @@ std::size_t read_at(SyncRandomAccessReadDevice& d,
uint64_t offset, const MutableBufferSequence& buffers,
CompletionCondition completion_condition, asio::error_code& ec);
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
/// Attempt to read a certain amount of data at the specified offset before
@ -384,6 +388,7 @@ std::size_t read_at(SyncRandomAccessReadDevice& d,
CompletionCondition completion_condition, asio::error_code& ec);
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
/*@}*/
/**
@ -535,6 +540,7 @@ async_read_at(AsyncRandomAccessReadDevice& d,
CompletionCondition completion_condition,
ASIO_MOVE_ARG(ReadHandler) handler);
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
/// Start an asynchronous operation to read a certain amount of data at the
@ -652,6 +658,7 @@ async_read_at(AsyncRandomAccessReadDevice& d,
ASIO_MOVE_ARG(ReadHandler) handler);
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
/*@}*/

10
asio/include/asio/read_until.hpp
View File

@ -16,15 +16,17 @@
#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
#include "asio/detail/config.hpp"
#include <cstddef>
#include <string>
#include "asio/async_result.hpp"
#include "asio/basic_streambuf_fwd.hpp"
#include "asio/detail/regex_fwd.hpp"
#include "asio/detail/type_traits.hpp"
#include "asio/error.hpp"
#if !defined(ASIO_NO_EXTENSIONS)
# include "asio/basic_streambuf_fwd.hpp"
#endif // !defined(ASIO_NO_EXTENSIONS)
#include "asio/detail/push_options.hpp"
namespace asio {
@ -264,6 +266,7 @@ std::size_t read_until(SyncReadStream& s,
const std::basic_string<char, std::char_traits<char>, Allocator>& delim,
asio::error_code& ec);
#if !defined(ASIO_NO_EXTENSIONS)
#if defined(ASIO_HAS_BOOST_REGEX) \
|| defined(GENERATING_DOCUMENTATION)
@ -976,6 +979,7 @@ std::size_t read_until(SyncReadStream& s,
typename enable_if<is_match_condition<MatchCondition>::value>::type* = 0);
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
/*@}*/
/**
@ -1168,6 +1172,7 @@ async_read_until(AsyncReadStream& s,
const std::string& delim,
ASIO_MOVE_ARG(ReadHandler) handler);
#if !defined(ASIO_NO_EXTENSIONS)
#if defined(ASIO_HAS_BOOST_REGEX) \
|| defined(GENERATING_DOCUMENTATION)
@ -1805,6 +1810,7 @@ async_read_until(AsyncReadStream& s,
typename enable_if<is_match_condition<MatchCondition>::value>::type* = 0);
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
/*@}*/

9
asio/include/asio/write.hpp
View File

@ -18,10 +18,13 @@
#include "asio/detail/config.hpp"
#include <cstddef>
#include "asio/async_result.hpp"
#include "asio/basic_streambuf_fwd.hpp"
#include "asio/buffer.hpp"
#include "asio/error.hpp"
#if !defined(ASIO_NO_EXTENSIONS)
# include "asio/basic_streambuf_fwd.hpp"
#endif // !defined(ASIO_NO_EXTENSIONS)
#include "asio/detail/push_options.hpp"
namespace asio {
@ -379,6 +382,7 @@ std::size_t write(SyncWriteStream& s,
is_dynamic_buffer_sequence<DynamicBufferSequence>::value
>::type* = 0);
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
/// Write all of the supplied data to a stream before returning.
@ -522,6 +526,7 @@ std::size_t write(SyncWriteStream& s, basic_streambuf<Allocator>& b,
CompletionCondition completion_condition, asio::error_code& ec);
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
/*@}*/
/**
@ -795,6 +800,7 @@ async_write(AsyncWriteStream& s,
is_dynamic_buffer_sequence<DynamicBufferSequence>::value
>::type* = 0);
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
/// Start an asynchronous operation to write all of the supplied data to a
@ -908,6 +914,7 @@ async_write(AsyncWriteStream& s, basic_streambuf<Allocator>& b,
ASIO_MOVE_ARG(WriteHandler) handler);
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
/*@}*/

9
asio/include/asio/write_at.hpp
View File

@ -18,10 +18,13 @@
#include "asio/detail/config.hpp"
#include <cstddef>
#include "asio/async_result.hpp"
#include "asio/basic_streambuf_fwd.hpp"
#include "asio/detail/cstdint.hpp"
#include "asio/error.hpp"
#if !defined(ASIO_NO_EXTENSIONS)
# include "asio/basic_streambuf_fwd.hpp"
#endif // !defined(ASIO_NO_EXTENSIONS)
#include "asio/detail/push_options.hpp"
namespace asio {
@ -224,6 +227,7 @@ std::size_t write_at(SyncRandomAccessWriteDevice& d,
uint64_t offset, const ConstBufferSequence& buffers,
CompletionCondition completion_condition, asio::error_code& ec);
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
/// Write all of the supplied data at the specified offset before returning.
@ -382,6 +386,7 @@ std::size_t write_at(SyncRandomAccessWriteDevice& d, uint64_t offset,
asio::error_code& ec);
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
/*@}*/
/**
@ -536,6 +541,7 @@ async_write_at(AsyncRandomAccessWriteDevice& d,
CompletionCondition completion_condition,
ASIO_MOVE_ARG(WriteHandler) handler);
#if !defined(ASIO_NO_EXTENSIONS)
#if !defined(ASIO_NO_IOSTREAM)
/// Start an asynchronous operation to write all of the supplied data at the
@ -658,6 +664,7 @@ async_write_at(AsyncRandomAccessWriteDevice& d, uint64_t offset,
ASIO_MOVE_ARG(WriteHandler) handler);
#endif // !defined(ASIO_NO_IOSTREAM)
#endif // !defined(ASIO_NO_EXTENSIONS)
/*@}*/