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

Rename to static_buffer, static_buffer_n (API Change):

Browse Source 
These classes are renamed:

* static_streambuf to static_buffer
* static_streambuf_n to static_buffer_n
This commit is contained in:
Vinnie Falco
2017-07-20 08:12:16 -07:00
parent 6e47e9a0ac
commit aa9f42cd06
14 changed files with 82 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/beast/websocket/impl/close.ipp
+3 -3
View File
@@ -10,7 +10,7 @@
#include <beast/core/handler_helpers.hpp>
#include <beast/core/handler_ptr.hpp>
#include <beast/core/static_streambuf.hpp>
#include <beast/core/static_buffer.hpp>
#include <beast/core/stream_concepts.hpp>
#include <memory>
@@ -43,7 +43,7 @@ class stream<NextLayer>::close_op
, cr(cr_)
{
ws.template write_close<
static_streambuf>(fb, cr);
static_buffer>(fb, cr);
}
};
@@ -235,7 +235,7 @@ close(close_reason const& cr, error_code& ec)
BOOST_ASSERT(! wr_close_);
wr_close_ = true;
detail::frame_streambuf fb;
write_close<static_streambuf>(fb, cr);
write_close<static_buffer>(fb, cr);
boost::asio::write(stream_, fb.data(), ec);
failed_ = ec != 0;
}
include/beast/websocket/impl/ping.ipp
+3 -3
View File
@@ -42,7 +42,7 @@ class stream<NextLayer>::ping_op
using boost::asio::buffer;
using boost::asio::buffer_copy;
ws.template write_ping<
static_streambuf>(fb, op_, payload);
static_buffer>(fb, op_, payload);
}
};
@@ -246,7 +246,7 @@ stream<NextLayer>::
ping(ping_data const& payload, error_code& ec)
{
detail::frame_streambuf db;
write_ping<static_streambuf>(
write_ping<static_buffer>(
db, opcode::ping, payload);
boost::asio::write(stream_, db.data(), ec);
}
@@ -268,7 +268,7 @@ stream<NextLayer>::
pong(ping_data const& payload, error_code& ec)
{
detail::frame_streambuf db;
write_ping<static_streambuf>(
write_ping<static_buffer>(
db, opcode::pong, payload);
boost::asio::write(stream_, db.data(), ec);
}
include/beast/websocket/impl/read.ipp
+7 -7
View File
@@ -13,7 +13,7 @@
#include <beast/core/handler_helpers.hpp>
#include <beast/core/handler_ptr.hpp>
#include <beast/core/prepare_buffers.hpp>
#include <beast/core/static_streambuf.hpp>
#include <beast/core/static_buffer.hpp>
#include <beast/core/stream_concepts.hpp>
#include <beast/core/detail/clamp.hpp>
#include <boost/assert.hpp>
@@ -444,7 +444,7 @@ operator()(error_code ec,
d.state = do_read_fh;
break;
}
d.ws.template write_ping<static_streambuf>(
d.ws.template write_ping<static_buffer>(
d.fb, opcode::pong, payload);
if(d.ws.wr_block_)
{
@@ -486,7 +486,7 @@ operator()(error_code ec,
cr.reason = "";
d.fb.reset();
d.ws.template write_close<
static_streambuf>(d.fb, cr);
static_buffer>(d.fb, cr);
if(d.ws.wr_block_)
{
// suspend
@@ -620,7 +620,7 @@ operator()(error_code ec,
}
d.fb.reset();
d.ws.template write_close<
static_streambuf>(d.fb, code);
static_buffer>(d.fb, code);
if(d.ws.wr_block_)
{
// suspend
@@ -793,7 +793,7 @@ read_frame(frame_info& fi, DynamicBuffer& dynabuf, error_code& ec)
fb.reset();
if(ping_cb_)
ping_cb_(false, payload);
write_ping<static_streambuf>(
write_ping<static_buffer>(
fb, opcode::pong, payload);
boost::asio::write(stream_, fb.data(), ec);
failed_ = ec != 0;
@@ -822,7 +822,7 @@ read_frame(frame_info& fi, DynamicBuffer& dynabuf, error_code& ec)
cr.reason = "";
fb.reset();
wr_close_ = true;
write_close<static_streambuf>(fb, cr);
write_close<static_buffer>(fb, cr);
boost::asio::write(stream_, fb.data(), ec);
failed_ = ec != 0;
if(failed_)
@@ -951,7 +951,7 @@ do_close:
{
wr_close_ = true;
detail::frame_streambuf fb;
write_close<static_streambuf>(fb, code);
write_close<static_buffer>(fb, code);
boost::asio::write(stream_, fb.data(), ec);
failed_ = ec != 0;
if(failed_)
include/beast/websocket/impl/stream.ipp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <beast/core/buffer_concepts.hpp>
#include <beast/core/consuming_buffers.hpp>
#include <beast/core/prepare_buffers.hpp>
#include <beast/core/static_streambuf.hpp>
#include <beast/core/static_buffer.hpp>
#include <beast/core/stream_concepts.hpp>
#include <beast/core/detail/type_traits.hpp>
#include <boost/assert.hpp>
include/beast/websocket/impl/write.ipp
+11 -11
View File
@@ -15,7 +15,7 @@
#include <beast/core/handler_helpers.hpp>
#include <beast/core/handler_ptr.hpp>
#include <beast/core/prepare_buffers.hpp>
#include <beast/core/static_streambuf.hpp>
#include <beast/core/static_buffer.hpp>
#include <beast/core/stream_concepts.hpp>
#include <beast/core/detail/clamp.hpp>
#include <beast/websocket/detail/frame.hpp>
@@ -234,7 +234,7 @@ operator()(error_code ec,
BOOST_ASSERT(d.ws.wr_block_ == &d);
d.fh.fin = d.fin;
d.fh.len = buffer_size(d.cb);
detail::write<static_streambuf>(
detail::write<static_buffer>(
d.fh_buf, d.fh);
d.ws.wr_.cont = ! d.fin;
// Send frame
@@ -260,7 +260,7 @@ operator()(error_code ec,
d.remain -= n;
d.fh.len = n;
d.fh.fin = d.fin ? d.remain == 0 : false;
detail::write<static_streambuf>(
detail::write<static_buffer>(
d.fh_buf, d.fh);
d.ws.wr_.cont = ! d.fin;
// Send frame
@@ -308,7 +308,7 @@ operator()(error_code ec,
d.fh.len = d.remain;
d.fh.key = d.ws.maskgen_();
detail::prepare_key(d.key, d.fh.key);
detail::write<static_streambuf>(
detail::write<static_buffer>(
d.fh_buf, d.fh);
auto const n =
clamp(d.remain, d.ws.wr_.buf_size);
@@ -366,7 +366,7 @@ operator()(error_code ec,
d.ws.wr_.buf.get(), n);
buffer_copy(b, d.cb);
detail::mask_inplace(b, d.key);
detail::write<static_streambuf>(
detail::write<static_buffer>(
d.fh_buf, d.fh);
d.ws.wr_.cont = ! d.fin;
// Send frame
@@ -442,7 +442,7 @@ operator()(error_code ec,
d.fh.fin = ! more;
d.fh.len = n;
detail::fh_streambuf fh_buf;
detail::write<static_streambuf>(fh_buf, d.fh);
detail::write<static_buffer>(fh_buf, d.fh);
d.ws.wr_.cont = ! d.fin;
// Send frame
d.state = more ?
@@ -647,7 +647,7 @@ write_frame(bool fin,
fh.fin = ! more;
fh.len = n;
detail::fh_streambuf fh_buf;
detail::write<static_streambuf>(fh_buf, fh);
detail::write<static_buffer>(fh_buf, fh);
wr_.cont = ! fin;
boost::asio::write(stream_,
buffer_cat(fh_buf.data(), b), ec);
@@ -675,7 +675,7 @@ write_frame(bool fin,
fh.fin = fin;
fh.len = remain;
detail::fh_streambuf fh_buf;
detail::write<static_streambuf>(fh_buf, fh);
detail::write<static_buffer>(fh_buf, fh);
wr_.cont = ! fin;
boost::asio::write(stream_,
buffer_cat(fh_buf.data(), buffers), ec);
@@ -696,7 +696,7 @@ write_frame(bool fin,
fh.len = n;
fh.fin = fin ? remain == 0 : false;
detail::fh_streambuf fh_buf;
detail::write<static_streambuf>(fh_buf, fh);
detail::write<static_buffer>(fh_buf, fh);
wr_.cont = ! fin;
boost::asio::write(stream_,
buffer_cat(fh_buf.data(),
@@ -721,7 +721,7 @@ write_frame(bool fin,
detail::prepared_key key;
detail::prepare_key(key, fh.key);
detail::fh_streambuf fh_buf;
detail::write<static_streambuf>(fh_buf, fh);
detail::write<static_buffer>(fh_buf, fh);
consuming_buffers<
ConstBufferSequence> cb{buffers};
{
@@ -772,7 +772,7 @@ write_frame(bool fin,
fh.fin = fin ? remain == 0 : false;
wr_.cont = ! fh.fin;
detail::fh_streambuf fh_buf;
detail::write<static_streambuf>(fh_buf, fh);
detail::write<static_buffer>(fh_buf, fh);
boost::asio::write(stream_,
buffer_cat(fh_buf.data(), b), ec);
failed_ = ec != 0;