parser requires basic_fields (API Change):

* `parser` is now templated on Allocator

* `parser` only produces messages using `basic_fields<Allocator>`
  as the Fields type.

* message-oriented read and async_read only work on messages
  using basic_fields as the Fields type.

Actions Required:

* Callers using `parser` with Fields types other than basic_fields
  will need to create their own subclass of basic_parser to work
  with their custom fields type.
This commit is contained in:
Vinnie Falco committed 2017-07-20 08:15:27 -07:00
1 parent 72ce21927c
commit 50902c3938
7 files changed
+68 -52

No files matched your search

+5 -5
View File
@@ -14,19 +14,19 @@
namespace beast {
namespace http {
template<bool isRequest, class Body, class Fields>
template<bool isRequest, class Body, class Allocator>
template<class Arg1, class... ArgN, class>
parser<isRequest, Body, Fields>::
parser<isRequest, Body, Allocator>::
parser(Arg1&& arg1, ArgN&&... argn)
: m_(std::forward<Arg1>(arg1),
std::forward<ArgN>(argn)...)
{
}
template<bool isRequest, class Body, class Fields>
template<bool isRequest, class Body, class Allocator>
template<class OtherBody, class... Args, class>
parser<isRequest, Body, Fields>::
parser(parser<isRequest, OtherBody, Fields>&& p,
parser<isRequest, Body, Allocator>::
parser(parser<isRequest, OtherBody, Allocator>&& p,
Args&&... args)
: base_type(std::move(p))
, m_(p.release(), std::forward<Args>(args)...)
+13 -13
View File
@@ -300,15 +300,15 @@ upcall:
//------------------------------------------------------------------------------
template<class Stream, class DynamicBuffer,
bool isRequest, class Body, class Fields,
bool isRequest, class Body, class Allocator,
class Handler>
class read_msg_op
{
using parser_type =
parser<isRequest, Body, Fields>;
parser<isRequest, Body, Allocator>;
using message_type =
message<isRequest, Body, Fields>;
typename parser_type::value_type;
struct data
{
@@ -383,11 +383,11 @@ public:
};
template<class Stream, class DynamicBuffer,
bool isRequest, class Body, class Fields,
bool isRequest, class Body, class Allocator,
class Handler>
void
read_msg_op<Stream, DynamicBuffer,
isRequest, Body, Fields, Handler>::
isRequest, Body, Allocator, Handler>::
operator()(error_code ec)
{
auto& d = *d_;
@@ -693,12 +693,12 @@ async_read(
template<
class SyncReadStream,
class DynamicBuffer,
bool isRequest, class Body, class Fields>
bool isRequest, class Body, class Allocator>
void
read(
SyncReadStream& stream,
DynamicBuffer& buffer,
message<isRequest, Body, Fields>& msg)
message<isRequest, Body, basic_fields<Allocator>>& msg)
{
static_assert(is_sync_read_stream<SyncReadStream>::value,
"SyncReadStream requirements not met");
@@ -717,12 +717,12 @@ read(
template<
class SyncReadStream,
class DynamicBuffer,
bool isRequest, class Body, class Fields>
bool isRequest, class Body, class Allocator>
void
read(
SyncReadStream& stream,
DynamicBuffer& buffer,
message<isRequest, Body, Fields>& msg,
message<isRequest, Body, basic_fields<Allocator>>& msg,
error_code& ec)
{
static_assert(is_sync_read_stream<SyncReadStream>::value,
@@ -733,7 +733,7 @@ read(
"Body requirements not met");
static_assert(is_body_writer<Body>::value,
"BodyWriter requirements not met");
parser<isRequest, Body, Fields> p{std::move(msg)};
parser<isRequest, Body, Allocator> p{std::move(msg)};
p.eager(true);
read(stream, buffer, p.base(), ec);
if(ec)
@@ -744,13 +744,13 @@ read(
template<
class AsyncReadStream,
class DynamicBuffer,
bool isRequest, class Body, class Fields,
bool isRequest, class Body, class Allocator,
class ReadHandler>
async_return_type<ReadHandler, void(error_code)>
async_read(
AsyncReadStream& stream,
DynamicBuffer& buffer,
message<isRequest, Body, Fields>& msg,
message<isRequest, Body, basic_fields<Allocator>>& msg,
ReadHandler&& handler)
{
static_assert(is_async_read_stream<AsyncReadStream>::value,
@@ -764,7 +764,7 @@ async_read(
async_completion<ReadHandler,
void(error_code)> init{handler};
detail::read_msg_op<AsyncReadStream, DynamicBuffer,
isRequest, Body, Fields, handler_type<
isRequest, Body, Allocator, handler_type<
ReadHandler, void(error_code)>>{
init.completion_handler, stream, buffer, msg}(
error_code{});