boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-08-03 14:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up declarations and files:

Browse Source 
* Adjust formatting
* Fix inline namespace warning in main.cpp
* Fix streambuf op ambiguous variadic constructor
* Rename variables for clarity
This commit is contained in:
Vinnie Falco
2016-05-04 11:04:58 -04:00
parent 96e1e53cdd
commit 4bbf393e38
7 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/beast/http/impl/read.ipp
View File

@@ -64,7 +64,7 @@ public:
read_op(read_op const&) = default; read_op(read_op const&) = default;
template<class DeducedHandler, class... Args> template<class DeducedHandler, class... Args>
read_op(DeducedHandler&& h, Stream&s, Args&&... args) read_op(DeducedHandler&& h, Stream& s, Args&&... args)
: d_(std::allocate_shared<data>(alloc_type{h}, : d_(std::allocate_shared<data>(alloc_type{h},
std::forward<DeducedHandler>(h), s, std::forward<DeducedHandler>(h), s,
std::forward<Args>(args)...)) std::forward<Args>(args)...))

29
include/beast/impl/streambuf_readstream.ipp
View File

@@ -26,16 +26,16 @@ class streambuf_readstream<
struct data struct data
{ {
streambuf_readstream& brs; streambuf_readstream& srs;
MutableBufferSequence bs; MutableBufferSequence bs;
Handler h; Handler h;
int state = 0; int state = 0;
template<class DeducedHandler> template<class DeducedHandler>
data(DeducedHandler&& h_, data(DeducedHandler&& h_,
streambuf_readstream& brs_, streambuf_readstream& srs_,
MutableBufferSequence const& bs_) MutableBufferSequence const& bs_)
: brs(brs_) : srs(srs_)
, bs(bs_) , bs(bs_)
, h(std::forward<DeducedHandler>(h_)) , h(std::forward<DeducedHandler>(h_))
{ {
@@ -49,9 +49,10 @@ public:
read_some_op(read_some_op const&) = default; read_some_op(read_some_op const&) = default;
template<class DeducedHandler, class... Args> template<class DeducedHandler, class... Args>
read_some_op(DeducedHandler&& h, Args&&... args) read_some_op(DeducedHandler&& h,
streambuf_readstream& srs, Args&&... args)
: d_(std::allocate_shared<data>(alloc_type{h}, : d_(std::allocate_shared<data>(alloc_type{h},
std::forward<DeducedHandler>(h), std::forward<DeducedHandler>(h), srs,
std::forward<Args>(args)...)) std::forward<Args>(args)...))
{ {
(*this)(error_code{}, 0); (*this)(error_code{}, 0);
@@ -106,44 +107,44 @@ read_some_op<MutableBufferSequence, Handler>::operator()(
switch(d.state) switch(d.state)
{ {
case 0: case 0:
if(d.brs.sb_.size() == 0) if(d.srs.sb_.size() == 0)
{ {
d.state = d.state =
d.brs.size_ > 0 ? 2 : 1; d.srs.size_ > 0 ? 2 : 1;
break; break;
} }
d.state = 4; d.state = 4;
d.brs.get_io_service().post( d.srs.get_io_service().post(
bind_handler(std::move(*this), ec, 0)); bind_handler(std::move(*this), ec, 0));
return; return;
case 1: case 1:
// read (unbuffered) // read (unbuffered)
d.state = 99; d.state = 99;
d.brs.next_layer_.async_read_some( d.srs.next_layer_.async_read_some(
d.bs, std::move(*this)); d.bs, std::move(*this));
return; return;
case 2: case 2:
// read // read
d.state = 3; d.state = 3;
d.brs.next_layer_.async_read_some( d.srs.next_layer_.async_read_some(
d.brs.sb_.prepare(d.brs.size_), d.srs.sb_.prepare(d.srs.size_),
std::move(*this)); std::move(*this));
return; return;
// got data // got data
case 3: case 3:
d.state = 4; d.state = 4;
d.brs.sb_.commit(bytes_transferred); d.srs.sb_.commit(bytes_transferred);
break; break;
// copy // copy
case 4: case 4:
bytes_transferred = bytes_transferred =
boost::asio::buffer_copy( boost::asio::buffer_copy(
d.bs, d.brs.sb_.data()); d.bs, d.srs.sb_.data());
d.brs.sb_.consume(bytes_transferred); d.srs.sb_.consume(bytes_transferred);
// call handler // call handler
d.state = 99; d.state = 99;
break; break;

1
include/beast/websocket/impl/read_frame_op.ipp
View File

@@ -12,6 +12,7 @@
#include <beast/handler_alloc.hpp> #include <beast/handler_alloc.hpp>
#include <beast/prepare_buffers.hpp> #include <beast/prepare_buffers.hpp>
#include <beast/static_streambuf.hpp> #include <beast/static_streambuf.hpp>
#include <boost/optional.hpp>
#include <cassert> #include <cassert>
#include <memory> #include <memory>

6
include/beast/websocket/impl/ssl.ipp
View File

@@ -60,11 +60,9 @@ public:
template<class DeducedHandler> template<class DeducedHandler>
explicit explicit
teardown_ssl_op( teardown_ssl_op(
DeducedHandler&& h, DeducedHandler&& h, stream_type& stream)
stream_type& stream)
: d_(std::make_shared<data>( : d_(std::make_shared<data>(
std::forward<DeducedHandler>(h), std::forward<DeducedHandler>(h), stream))
stream))
{ {
(*this)(error_code{}, false); (*this)(error_code{}, false);
} }

3
include/beast/websocket/impl/teardown.ipp
View File

@@ -32,8 +32,7 @@ class teardown_tcp_op
int state = 0; int state = 0;
template<class DeducedHandler> template<class DeducedHandler>
data(DeducedHandler&& h_, data(DeducedHandler&& h_, socket_type& socket_)
socket_type& socket_)
: socket(socket_) : socket(socket_)
, h(std::forward<DeducedHandler>(h_)) , h(std::forward<DeducedHandler>(h_))
, cont(boost_asio_handler_cont_helpers:: , cont(boost_asio_handler_cont_helpers::

2
test/main.cpp
View File

@@ -41,6 +41,8 @@
namespace beast { namespace beast {
namespace detail { namespace detail {
inline
namespace unit_test { namespace unit_test {
std::string std::string

4
test/sig_wait.hpp
View File

@@ -17,8 +17,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef BEAST_TEST_SIG_WAIT_H_INCLUDED #ifndef BEAST_TEST_SIG_WAIT_HPP
#define BEAST_TEST_SIG_WAIT_H_INCLUDED #define BEAST_TEST_SIG_WAIT_HPP
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <condition_variable> #include <condition_variable>