feedc0de/boost_beast
1
0 Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Boost test matrix fixes

Browse Source
This commit is contained in:
Vinnie Falco committed 2017-08-08 11:11:31 -07:00
1 parent 1366302a29
commit cf8182794a
6 files changed
+31 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/boost/beast/core/detail/type_traits.hpp
+5 -1
View File
@@ -232,7 +232,11 @@ constexpr
typename unwidest_unsigned<U0, U1, UN...>::type
min_all(U0 u0, U1 u1, UN... un)
{
return u0 < u1? min_all(u0, un...) : min_all(u1, un...);
using type =
typename unwidest_unsigned<U0, U1, UN...>::type;
return u0 < u1 ?
static_cast<type>(min_all(u0, un...)) :
static_cast<type>(min_all(u1, un...));
}
template<class U>
include/boost/beast/core/impl/static_buffer.ipp
+12 -12
View File
@@ -38,11 +38,11 @@ data() const ->
using boost::asio::const_buffer;
if(in_off_ + in_size_ <= capacity_)
return {{
const_buffer{begin_ + in_off_, in_size_},
const_buffer{begin_, 0}}};
{const_buffer{begin_ + in_off_, in_size_}},
{const_buffer{begin_, 0}}}};
return {{
const_buffer{begin_ + in_off_, capacity_ - in_off_},
const_buffer{begin_, in_size_ - (capacity_ - in_off_)}}};
{const_buffer{begin_ + in_off_, capacity_ - in_off_}},
{const_buffer{begin_, in_size_ - (capacity_ - in_off_)}}}};
}
inline
@@ -54,11 +54,11 @@ mutable_data() ->
using boost::asio::mutable_buffer;
if(in_off_ + in_size_ <= capacity_)
return {{
mutable_buffer{begin_ + in_off_, in_size_},
mutable_buffer{begin_, 0}}};
{mutable_buffer{begin_ + in_off_, in_size_}},
{mutable_buffer{begin_, 0}}}};
return {{
mutable_buffer{begin_ + in_off_, capacity_ - in_off_},
mutable_buffer{begin_, in_size_ - (capacity_ - in_off_)}}};
{mutable_buffer{begin_ + in_off_, capacity_ - in_off_}},
{mutable_buffer{begin_, in_size_ - (capacity_ - in_off_)}}}};
}
inline
@@ -75,11 +75,11 @@ prepare(std::size_t size) ->
auto const out_off = (in_off_ + in_size_) % capacity_;
if(out_off + out_size_ <= capacity_ )
return {{
mutable_buffer{begin_ + out_off, out_size_},
mutable_buffer{begin_, 0}}};
{mutable_buffer{begin_ + out_off, out_size_}},
{mutable_buffer{begin_, 0}}}};
return {{
mutable_buffer{begin_ + out_off, capacity_ - out_off},
mutable_buffer{begin_, out_size_ - (capacity_ - out_off)}}};
{mutable_buffer{begin_ + out_off, capacity_ - out_off}},
{mutable_buffer{begin_, out_size_ - (capacity_ - out_off)}}}};
}
inline