forked from boostorg/beast
Qualify buffer_copy, don't qualify buffer_size:
fix #1416 * Calls to buffer_copy are qualified as net::buffer_copy * Calls to buffer_size are made unqualified, permitting argument dependent lookup to take effect.
This commit is contained in:
1 parent
5b0b218d96
commit
a142969c5d
34 files changed
+162
-161
No files matched your search
@@ -161,8 +161,6 @@ read_some(MutableBufferSequence const& buffers,
|
||||
static_assert(net::is_mutable_buffer_sequence<
|
||||
MutableBufferSequence>::value,
|
||||
"MutableBufferSequence requirements not met");
|
||||
using net::buffer_size;
|
||||
using net::buffer_copy;
|
||||
if(buffer_.size() == 0)
|
||||
{
|
||||
if(capacity_ == 0)
|
||||
@@ -178,7 +176,7 @@ read_some(MutableBufferSequence const& buffers,
|
||||
ec = {};
|
||||
}
|
||||
auto bytes_transferred =
|
||||
buffer_copy(buffers, buffer_.data());
|
||||
net::buffer_copy(buffers, buffer_.data());
|
||||
buffer_.consume(bytes_transferred);
|
||||
return bytes_transferred;
|
||||
}
|
||||
|
||||
@@ -415,7 +415,12 @@ buffers_adaptor(
|
||||
, begin_(net::buffer_sequence_begin(bs_))
|
||||
, out_ (net::buffer_sequence_begin(bs_))
|
||||
, end_ (net::buffer_sequence_begin(bs_))
|
||||
, max_size_(net::buffer_size(bs_))
|
||||
, max_size_(
|
||||
[&]
|
||||
{
|
||||
using net::buffer_size;
|
||||
return buffer_size(bs_);
|
||||
}())
|
||||
{
|
||||
}
|
||||
|
||||
@@ -497,14 +502,15 @@ prepare(std::size_t n) ->
|
||||
end_ = out_;
|
||||
if(end_ != net::buffer_sequence_end(bs_))
|
||||
{
|
||||
auto size = net::buffer_size(*end_) - out_pos_;
|
||||
using net::buffer_size;
|
||||
auto size = buffer_size(*end_) - out_pos_;
|
||||
if(n > size)
|
||||
{
|
||||
n -= size;
|
||||
while(++end_ !=
|
||||
net::buffer_sequence_end(bs_))
|
||||
{
|
||||
size = net::buffer_size(*end_);
|
||||
size = buffer_size(*end_);
|
||||
if(n < size)
|
||||
{
|
||||
out_end_ = n;
|
||||
@@ -539,8 +545,9 @@ commit(std::size_t n) noexcept
|
||||
auto const last = std::prev(end_);
|
||||
while(out_ != last)
|
||||
{
|
||||
using net::buffer_size;
|
||||
auto const avail =
|
||||
net::buffer_size(*out_) - out_pos_;
|
||||
buffer_size(*out_) - out_pos_;
|
||||
if(n < avail)
|
||||
{
|
||||
out_pos_ += n;
|
||||
@@ -557,7 +564,7 @@ commit(std::size_t n) noexcept
|
||||
n, out_end_ - out_pos_);
|
||||
out_pos_ += n;
|
||||
in_size_ += n;
|
||||
if(out_pos_ == net::buffer_size(*out_))
|
||||
if(out_pos_ == buffer_size(*out_))
|
||||
{
|
||||
++out_;
|
||||
out_pos_ = 0;
|
||||
@@ -572,8 +579,9 @@ consume(std::size_t n) noexcept
|
||||
{
|
||||
while(begin_ != out_)
|
||||
{
|
||||
using net::buffer_size;
|
||||
auto const avail =
|
||||
net::buffer_size(*begin_) - in_pos_;
|
||||
buffer_size(*begin_) - in_pos_;
|
||||
if(n < avail)
|
||||
{
|
||||
in_size_ -= n;
|
||||
|
||||
@@ -149,7 +149,8 @@ setup(std::size_t size)
|
||||
auto const last = bs_.end();
|
||||
while(end_ != last)
|
||||
{
|
||||
auto const len = net::buffer_size(*end_++);
|
||||
using net::buffer_size;
|
||||
auto const len = buffer_size(*end_++);
|
||||
if(len >= size)
|
||||
{
|
||||
size_ += size;
|
||||
|
||||
@@ -206,8 +206,9 @@ consume(std::size_t amount)
|
||||
net::buffer_sequence_end(bs_);
|
||||
for(;amount > 0 && begin_ != end; ++begin_)
|
||||
{
|
||||
using net::buffer_size;
|
||||
auto const len =
|
||||
net::buffer_size(*begin_) - skip_;
|
||||
buffer_size(*begin_) - skip_;
|
||||
if(amount < len)
|
||||
{
|
||||
skip_ += amount;
|
||||
|
||||
@@ -90,8 +90,7 @@ flat_static_buffer<N>::
|
||||
flat_static_buffer(flat_static_buffer const& other)
|
||||
: flat_static_buffer_base(buf_, N)
|
||||
{
|
||||
using net::buffer_copy;
|
||||
this->commit(buffer_copy(
|
||||
this->commit(net::buffer_copy(
|
||||
this->prepare(other.size()), other.data()));
|
||||
}
|
||||
|
||||
@@ -101,11 +100,10 @@ flat_static_buffer<N>::
|
||||
operator=(flat_static_buffer const& other) ->
|
||||
flat_static_buffer<N>&
|
||||
{
|
||||
using net::buffer_copy;
|
||||
if(this == &other)
|
||||
return *this;
|
||||
this->consume(this->size());
|
||||
this->commit(buffer_copy(
|
||||
this->commit(net::buffer_copy(
|
||||
this->prepare(other.size()), other.data()));
|
||||
return *this;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user