From 6ccc61d94095bd1aa6d0fbf8d8f713eec1c9c465 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Tue, 24 Oct 2017 13:32:35 -0700
Subject: [PATCH] Fix buffered_read_stream async_read_some signature

---
 CHANGELOG.md                                   |  1 +
 .../boost/beast/core/buffered_read_stream.hpp  |  4 ++--
 .../beast/core/impl/buffered_read_stream.ipp   | 18 ++++++++++--------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0d67c18..926488b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Version 126:
 * Fix executor type compilation
 * Add Travis tests with the default compilers
 * Update Boost.WinAPI usage to the new location and namespace.
+* Fix buffered_read_stream async_read_some signature
 
 --------------------------------------------------------------------------------
 
diff --git a/include/boost/beast/core/buffered_read_stream.hpp b/include/boost/beast/core/buffered_read_stream.hpp
index 378ae232..e683a409 100644
--- a/include/boost/beast/core/buffered_read_stream.hpp
+++ b/include/boost/beast/core/buffered_read_stream.hpp
@@ -288,7 +288,7 @@ public:
     */
     template<class MutableBufferSequence, class ReadHandler>
     BOOST_ASIO_INITFN_RESULT_TYPE(
-        ReadHandler, void(error_code))
+        ReadHandler, void(error_code, std::size_t))
     async_read_some(MutableBufferSequence const& buffers,
         ReadHandler&& handler);
 
@@ -360,7 +360,7 @@ public:
     */
     template<class ConstBufferSequence, class WriteHandler>
     BOOST_ASIO_INITFN_RESULT_TYPE(
-        WriteHandler, void(error_code))
+        WriteHandler, void(error_code, std::size_t))
     async_write_some(ConstBufferSequence const& buffers,
         WriteHandler&& handler);
 };
diff --git a/include/boost/beast/core/impl/buffered_read_stream.ipp b/include/boost/beast/core/impl/buffered_read_stream.ipp
index 0afdfb64..9e9fa530 100644
--- a/include/boost/beast/core/impl/buffered_read_stream.ipp
+++ b/include/boost/beast/core/impl/buffered_read_stream.ipp
@@ -144,11 +144,12 @@ buffered_read_stream(Args&&... args)
 
 template<class Stream, class DynamicBuffer>
 template<class ConstBufferSequence, class WriteHandler>
-auto
+BOOST_ASIO_INITFN_RESULT_TYPE(
+    WriteHandler, void(error_code, std::size_t))
 buffered_read_stream<Stream, DynamicBuffer>::
-async_write_some(ConstBufferSequence const& buffers,
-        WriteHandler&& handler) ->
-    BOOST_ASIO_INITFN_RESULT_TYPE(WriteHandler, void(error_code))
+async_write_some(
+    ConstBufferSequence const& buffers,
+    WriteHandler&& handler)
 {
     static_assert(is_async_write_stream<next_layer_type>::value,
         "AsyncWriteStream requirements not met");
@@ -217,11 +218,12 @@ read_some(MutableBufferSequence const& buffers,
 
 template<class Stream, class DynamicBuffer>
 template<class MutableBufferSequence, class ReadHandler>
-auto
+BOOST_ASIO_INITFN_RESULT_TYPE(
+    ReadHandler, void(error_code, std::size_t))
 buffered_read_stream<Stream, DynamicBuffer>::
-async_read_some(MutableBufferSequence const& buffers,
-        ReadHandler&& handler) ->
-    BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void(error_code))
+async_read_some(
+    MutableBufferSequence const& buffers,
+    ReadHandler&& handler)
 {
     static_assert(is_async_read_stream<next_layer_type>::value,
         "AsyncReadStream requirements not met");