From 64206b5612d3380aed6caffacb0a7fe89056c54f Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Mon, 20 Jun 2016 11:09:08 -0400 Subject: [PATCH] Qualify some calls: This fixes a problem where a call to read() is ambiguous because the argument list contains objects from both boost::asio and beast::http. Users invoking read may need to do so fully qualified, by writing: beast::http::read(...); --- CHANGELOG | 6 ++++++ include/beast/http/impl/read.ipp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0eacc6fe..df5b852c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +1.0.0-b7 + +* Fully qualify ambiguous calls to read and parse + +-------------------------------------------------------------------------------- + 1.0.0-b6 * Use SFINAE on return values diff --git a/include/beast/http/impl/read.ipp b/include/beast/http/impl/read.ipp index 38c09eb5..24b484e3 100644 --- a/include/beast/http/impl/read.ipp +++ b/include/beast/http/impl/read.ipp @@ -412,7 +412,7 @@ read(SyncReadStream& stream, DynamicBuffer& dynabuf, static_assert(is_ReadableBody::value, "ReadableBody requirements not met"); error_code ec; - read(stream, dynabuf, msg, ec); + beast::http::read(stream, dynabuf, msg, ec); if(ec) throw system_error{ec}; } @@ -431,7 +431,7 @@ read(SyncReadStream& stream, DynamicBuffer& dynabuf, static_assert(is_ReadableBody::value, "ReadableBody requirements not met"); parser_v1 p; - parse(stream, dynabuf, p, ec); + beast::http::parse(stream, dynabuf, p, ec); if(ec) return; assert(p.complete());