Use BOOST_ASSERT

This commit is contained in:
Vinnie Falco committed 2017-07-20 08:12:09 -07:00
1 parent 58d3ea6548
commit dff2751c07
20 files changed
+73 -72

No files matched your search

+1 -1
View File
@@ -14,7 +14,7 @@
#include <beast/http/read.hpp>
#include <beast/core/handler_alloc.hpp>
#include <beast/core/prepare_buffers.hpp>
#include <cassert>
#include <boost/assert.hpp>
#include <memory>
#include <type_traits>
+1 -1
View File
@@ -155,7 +155,7 @@ operator()(error_code ec, bool again)
// send close frame
d.state = 99;
d.ws.wr_close_ = true;
assert(! d.ws.wr_block_);
BOOST_ASSERT(! d.ws.wr_block_);
d.ws.wr_block_ = &d;
boost::asio::async_write(d.ws.stream_,
d.fb.data(), std::move(*this));
@@ -13,7 +13,7 @@
#include <beast/http/read.hpp>
#include <beast/http/write.hpp>
#include <beast/core/handler_alloc.hpp>
#include <cassert>
#include <boost/assert.hpp>
#include <memory>
namespace beast {
+1 -1
View File
@@ -154,7 +154,7 @@ operator()(error_code ec, bool again)
case 1:
// send ping frame
d.state = 99;
assert(! d.ws.wr_block_);
BOOST_ASSERT(! d.ws.wr_block_);
d.ws.wr_block_ = &d;
boost::asio::async_write(d.ws.stream_,
d.fb.data(), std::move(*this));
@@ -12,8 +12,8 @@
#include <beast/core/handler_alloc.hpp>
#include <beast/core/prepare_buffers.hpp>
#include <beast/core/static_streambuf.hpp>
#include <boost/assert.hpp>
#include <boost/optional.hpp>
#include <cassert>
#include <memory>
namespace beast {
@@ -330,7 +330,7 @@ operator()(error_code ec,std::size_t bytes_transferred, bool again)
{
// suspend
d.state = do_pong_resume;
assert(d.ws.wr_block_ != &d);
BOOST_ASSERT(d.ws.wr_block_ != &d);
d.ws.rd_op_.template emplace<
read_frame_op>(std::move(*this));
return;
@@ -349,7 +349,7 @@ operator()(error_code ec,std::size_t bytes_transferred, bool again)
d.state = do_read_fh;
break;
}
assert(d.ws.rd_fh_.op == opcode::close);
BOOST_ASSERT(d.ws.rd_fh_.op == opcode::close);
{
detail::read(d.ws.cr_, d.fb.data(), code);
if(code != close_code::none)
@@ -413,7 +413,7 @@ operator()(error_code ec,std::size_t bytes_transferred, bool again)
}
// send pong
d.state = do_pong + 1;
assert(! d.ws.wr_block_);
BOOST_ASSERT(! d.ws.wr_block_);
d.ws.wr_block_ = &d;
boost::asio::async_write(d.ws.stream_,
d.fb.data(), std::move(*this));
@@ -455,7 +455,7 @@ operator()(error_code ec,std::size_t bytes_transferred, bool again)
case do_close:
d.state = do_close + 1;
d.ws.wr_close_ = true;
assert(! d.ws.wr_block_);
BOOST_ASSERT(! d.ws.wr_block_);
d.ws.wr_block_ = &d;
boost::asio::async_write(d.ws.stream_,
d.fb.data(), std::move(*this));
@@ -498,7 +498,7 @@ operator()(error_code ec,std::size_t bytes_transferred, bool again)
// send close frame
d.state = do_fail + 4;
d.ws.wr_close_ = true;
assert(! d.ws.wr_block_);
BOOST_ASSERT(! d.ws.wr_block_);
d.ws.wr_block_ = &d;
boost::asio::async_write(d.ws.stream_,
d.fb.data(), std::move(*this));
+3 -3
View File
@@ -29,9 +29,9 @@
#include <beast/core/prepare_buffers.hpp>
#include <beast/core/static_streambuf.hpp>
#include <beast/core/stream_concepts.hpp>
#include <boost/assert.hpp>
#include <boost/endian/buffers.hpp>
#include <algorithm>
#include <cassert>
#include <memory>
#include <utility>
@@ -411,7 +411,7 @@ close(close_reason const& cr, error_code& ec)
{
static_assert(is_SyncStream<next_layer_type>::value,
"SyncStream requirements not met");
assert(! wr_close_);
BOOST_ASSERT(! wr_close_);
wr_close_ = true;
detail::frame_streambuf fb;
write_close<static_streambuf>(fb, cr);
@@ -608,7 +608,7 @@ read_frame(frame_info& fi, DynamicBuffer& dynabuf, error_code& ec)
pong_cb_(payload);
continue;
}
assert(rd_fh_.op == opcode::close);
BOOST_ASSERT(rd_fh_.op == opcode::close);
{
detail::read(cr_, fb.data(), code);
if(code != close_code::none)
@@ -14,8 +14,8 @@
#include <beast/core/handler_alloc.hpp>
#include <beast/core/static_streambuf.hpp>
#include <beast/websocket/detail/frame.hpp>
#include <boost/assert.hpp>
#include <algorithm>
#include <cassert>
#include <memory>
namespace beast {
@@ -199,7 +199,7 @@ operator()(error_code ec, bool again)
{
// send header and entire payload
d.state = 99;
assert(! d.ws.wr_block_);
BOOST_ASSERT(! d.ws.wr_block_);
d.ws.wr_block_ = &d;
boost::asio::async_write(d.ws.stream_,
buffer_cat(d.fh_buf.data(), d.cb),
@@ -215,7 +215,7 @@ operator()(error_code ec, bool again)
detail::mask_inplace(mb, d.key);
// send header and payload
d.state = d.remain > 0 ? 2 : 99;
assert(! d.ws.wr_block_);
BOOST_ASSERT(! d.ws.wr_block_);
d.ws.wr_block_ = &d;
boost::asio::async_write(d.ws.stream_,
buffer_cat(d.fh_buf.data(),
@@ -237,7 +237,7 @@ operator()(error_code ec, bool again)
// send payload
if(d.remain == 0)
d.state = 99;
assert(d.ws.wr_block_ == &d);
BOOST_ASSERT(d.ws.wr_block_ == &d);
boost::asio::async_write(
d.ws.stream_, mb, std::move(*this));
return;
+1 -1
View File
@@ -12,8 +12,8 @@
#include <beast/core/prepare_buffers.hpp>
#include <beast/core/handler_alloc.hpp>
#include <beast/websocket/detail/frame.hpp>
#include <boost/assert.hpp>
#include <algorithm>
#include <cassert>
#include <memory>
namespace beast {