boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-30 21:07:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix strict aliasing warnings in buffers_view

Browse Source
This commit is contained in:
Vinnie Falco
2017-05-21 05:01:43 -07:00
parent f957af483f
commit 000349ba23
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
Version 43 Version 43
* Require Boost 1.64.0 * Require Boost 1.64.0
* Fix strict aliasing warnings in buffers_view
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

19
include/beast/core/impl/buffer_cat.ipp
View File

@ -10,6 +10,7 @@
#include <beast/core/detail/type_traits.hpp> #include <beast/core/detail/type_traits.hpp>
#include <boost/asio/buffer.hpp> #include <boost/asio/buffer.hpp>
#include <array>
#include <cstdint> #include <cstdint>
#include <iterator> #include <iterator>
#include <new> #include <new>
@ -24,8 +25,8 @@ class buffers_view<Bn...>::const_iterator
{ {
std::size_t n_; std::size_t n_;
std::tuple<Bn...> const* bn_; std::tuple<Bn...> const* bn_;
char buf_[detail::max_sizeof< std::array<char, detail::max_sizeof<
typename Bn::const_iterator...>()]; typename Bn::const_iterator...>()> buf_;
friend class buffers_view<Bn...>; friend class buffers_view<Bn...>;
@ -42,7 +43,7 @@ class buffers_view<Bn...>::const_iterator
{ {
// type-pun // type-pun
return *reinterpret_cast< return *reinterpret_cast<
iter_t<I>*>(static_cast<void*>(buf_)); iter_t<I>*>(static_cast<void*>(buf_.data()));
} }
template<std::size_t I> template<std::size_t I>
@ -52,7 +53,7 @@ class buffers_view<Bn...>::const_iterator
// type-pun // type-pun
return *reinterpret_cast< return *reinterpret_cast<
iter_t<I> const*>(static_cast< iter_t<I> const*>(static_cast<
void const*>(buf_)); void const*>(buf_.data()));
} }
public: public:
@ -127,7 +128,7 @@ private:
std::get<I>(*bn_).end()) std::get<I>(*bn_).end())
{ {
n_ = I; n_ = I;
new(buf_) iter_t<I>{ new(&buf_[0]) iter_t<I>{
std::get<I>(*bn_).begin()}; std::get<I>(*bn_).begin()};
return; return;
} }
@ -166,7 +167,7 @@ private:
{ {
if(n_ == I) if(n_ == I)
{ {
new(buf_) iter_t<I>{ new(&buf_[0]) iter_t<I>{
std::move(other.iter<I>())}; std::move(other.iter<I>())};
return; return;
} }
@ -186,7 +187,7 @@ private:
{ {
if(n_ == I) if(n_ == I)
{ {
new(buf_) iter_t<I>{ new(&buf_[0]) iter_t<I>{
other.iter<I>()}; other.iter<I>()};
return; return;
} }
@ -258,7 +259,7 @@ private:
if(n_ == I) if(n_ == I)
{ {
--n_; --n_;
new(buf_) iter_t<I-1>{ new(&buf_[0]) iter_t<I-1>{
std::get<I-1>(*bn_).end()}; std::get<I-1>(*bn_).end()};
} }
decrement(C<I-1>{}); decrement(C<I-1>{});
@ -291,7 +292,7 @@ private:
--n_; --n_;
using Iter = iter_t<I>; using Iter = iter_t<I>;
iter<I>().~Iter(); iter<I>().~Iter();
new(buf_) iter_t<I-1>{ new(&buf_[0]) iter_t<I-1>{
std::get<I-1>(*bn_).end()}; std::get<I-1>(*bn_).end()};
} }
decrement(C<I-1>{}); decrement(C<I-1>{});