boostorg/mqtt5
1
0
Fork 1
mirror of https://github.com/boostorg/mqtt5.git synced 2025-07-29 20:17:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated API usage

Browse Source 
Summary: related to T13767

Reviewers: ivica

Reviewed By: ivica

Subscribers: miljen, iljazovic

Differential Revision: https://repo.mireo.local/D28958
This commit is contained in:
Korina Šimičević
2024-04-16 08:31:44 +02:00
parent ccc8d48efc
commit bfae05f7a9
7 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/include/test_common/delayed_op.hpp
View File

@ -62,7 +62,7 @@ public:
void perform(CompletionHandler&& handler) {
_cancel_slot = asio::get_associated_cancellation_slot(handler);
_timer->expires_from_now(_delay);
_timer->expires_after(_delay);
_timer->async_wait(
asio::prepend(std::move(*this), on_timer {}, std::move(handler))
);

12
test/include/test_common/packet_util.hpp
View File

@ -6,6 +6,8 @@
#include <boost/algorithm/string/join.hpp>
#include <boost/asio/buffer.hpp>
#include <boost/range/algorithm/transform.hpp>
#include <async_mqtt5/detail/control_packet.hpp>
@ -358,11 +360,17 @@ inline std::string to_readable_packet(std::string packet) {
template <typename ConstBufferSequence>
std::vector<std::string> to_readable_packets(const ConstBufferSequence& buffers) {
namespace asio = boost::asio;
std::vector<std::string> content;
for (const auto& buff : buffers)
for (
auto it = asio::buffer_sequence_begin(buffers);
it != asio::buffer_sequence_end(buffers);
it++
)
content.push_back(
to_readable_packet(std::string { (const char*) buff.data(), buff.size() })
to_readable_packet(std::string { (const char*)it->data(), it->size() })
);
return content;

11
test/include/test_common/test_broker.hpp
View File

@ -36,7 +36,7 @@ class pending_read {
public:
template <typename MutableBuffer, typename Handler>
pending_read(const MutableBuffer& buffer, Handler&& handler) :
_buffer_data(asio::buffer_cast<void*>(buffer)),
_buffer_data(buffer.data()),
_buffer_size(buffer.size()),
_handler(std::move(handler))
{}
@ -133,8 +133,9 @@ public:
auto reply_action = _broker_side.pop_reply_action();
size_t bytes_written = std::accumulate(
std::begin(buffers), std::end(buffers), size_t(0),
[](size_t a, const auto& b) { return a + b.size(); }
asio::buffer_sequence_begin(buffers),
asio::buffer_sequence_end(buffers),
size_t(0), [](size_t a, const auto& b) { return a + b.size(); }
);
executor_type ex = get_executor();
@ -143,12 +144,12 @@ public:
const auto& expected = reply_action->expected_packets();
size_t buffers_size = std::distance(
buffers.begin(), buffers.end()
asio::buffer_sequence_begin(buffers), asio::buffer_sequence_end(buffers)
);
BOOST_CHECK_EQUAL(buffers_size, expected.size());
size_t num_packets = std::min(buffers_size, expected.size());
auto it = buffers.begin();
auto it = asio::buffer_sequence_begin(buffers);
for (size_t i = 0; i < num_packets; ++i, ++it) {
BOOST_CHECK_EQUAL(it->size(), expected[i].size());
size_t len = std::min(it->size(), expected[i].size());