From 5ade2a5050635642523f636614bb13b859ce2f33 Mon Sep 17 00:00:00 2001 From: Damian Jarek Date: Wed, 21 Nov 2018 01:09:50 +0100 Subject: [PATCH] Tidying: fix #1311, fix #1310, fix #1309 * Remove unused include directive * Remove redundant static_assert * Remove redundant use of bind_handler Signed-off-by: Damian Jarek --- CHANGELOG.md | 1 + .../boost/beast/_experimental/core/impl/timeout_socket.hpp | 1 - include/boost/beast/core/handler_ptr.hpp | 3 --- include/boost/beast/http/impl/write.ipp | 4 ++-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f5e7d17..7a9a5185 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Version 190: * Unit test framework is experimental * Add buffers_range * Rename experimental directory +* Improve compilation of tests for continuous integration -------------------------------------------------------------------------------- diff --git a/include/boost/beast/_experimental/core/impl/timeout_socket.hpp b/include/boost/beast/_experimental/core/impl/timeout_socket.hpp index ec8edb3f..05b716a1 100644 --- a/include/boost/beast/_experimental/core/impl/timeout_socket.hpp +++ b/include/boost/beast/_experimental/core/impl/timeout_socket.hpp @@ -10,7 +10,6 @@ #ifndef BOOST_BEAST_CORE_IMPL_TIMOUT_SOCKET_HPP #define BOOST_BEAST_CORE_IMPL_TIMOUT_SOCKET_HPP -#include #include #include #include diff --git a/include/boost/beast/core/handler_ptr.hpp b/include/boost/beast/core/handler_ptr.hpp index 64de1b7d..d25e07df 100644 --- a/include/boost/beast/core/handler_ptr.hpp +++ b/include/boost/beast/core/handler_ptr.hpp @@ -58,9 +58,6 @@ class handler_ptr void clear(); public: - static_assert(std::is_nothrow_destructible::value, - "T must be nothrow destructible"); - /// The type of element stored using element_type = T; diff --git a/include/boost/beast/http/impl/write.ipp b/include/boost/beast/http/impl/write.ipp index 5e657b19..63f8a5ca 100644 --- a/include/boost/beast/http/impl/write.ipp +++ b/include/boost/beast/http/impl/write.ipp @@ -294,7 +294,7 @@ operator()( BOOST_ASIO_CORO_YIELD boost::asio::post( s_.get_executor(), - bind_handler(std::move(*this))); + std::move(*this)); goto upcall; } for(;;) @@ -991,7 +991,7 @@ operator<<(std::ostream& os, { os.setstate(std::ios::failbit); break; - } + } } while(! sr.is_done()); return os;