diff --git a/CHANGELOG.md b/CHANGELOG.md index 72436494..a7bc1908 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Version 244: + +* Tidy up declval in some traits + +-------------------------------------------------------------------------------- + Version 243: * Fix some typos diff --git a/include/boost/beast/core/detail/stream_traits.hpp b/include/boost/beast/core/detail/stream_traits.hpp index ce7f679b..bb1e29c2 100644 --- a/include/boost/beast/core/detail/stream_traits.hpp +++ b/include/boost/beast/core/detail/stream_traits.hpp @@ -80,10 +80,10 @@ struct BufferSequence { using value_type = BufferType; using const_iterator = BufferType const*; - ~BufferSequence(); + ~BufferSequence() = default; BufferSequence(BufferSequence const&) = default; - const_iterator begin() const noexcept; - const_iterator end() const noexcept; + const_iterator begin() const noexcept { return {}; } + const_iterator end() const noexcept { return {}; } }; using ConstBufferSequence = BufferSequence; @@ -97,7 +97,7 @@ using MutableBufferSequence = struct StreamHandler { StreamHandler(StreamHandler const&) = default; - void operator()(error_code ec, std::size_t); + void operator()(error_code, std::size_t) {} }; using ReadHandler = StreamHandler; using WriteHandler = StreamHandler; diff --git a/include/boost/beast/core/stream_traits.hpp b/include/boost/beast/core/stream_traits.hpp index 53b663b6..f1945ea9 100644 --- a/include/boost/beast/core/stream_traits.hpp +++ b/include/boost/beast/core/stream_traits.hpp @@ -208,9 +208,9 @@ struct is_sync_read_stream : std::false_type {}; template struct is_sync_read_stream() = std::declval().read_some( + std::declval() = std::declval().read_some( std::declval()), - std::declval() = std::declval().read_some( + std::declval() = std::declval().read_some( std::declval(), std::declval()) )>> : std::true_type {}; @@ -335,7 +335,7 @@ struct is_async_read_stream : std::false_type {}; template struct is_async_read_stream().async_read_some( + std::declval().async_read_some( std::declval(), std::declval()) )>> : std::integral_constant struct is_async_write_stream().async_write_some( + std::declval().async_write_some( std::declval(), std::declval()) )>> : std::integral_constant