Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions include/boost/mqtt5/detail/traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,19 @@ constexpr bool is_boost_iterator = is_specialization<
boost::remove_cv_ref_t<T>, boost::iterator_range
>;

template <typename, typename, typename = void>
constexpr bool is_container_of_impl = false;

template <typename T, typename U>
constexpr bool is_container_of_impl<T, U, std::void_t<typename T::value_type>> =
std::is_same_v<typename T::value_type, U
>;

template <typename T, typename U>
constexpr bool is_container_of = is_container_of_impl<
boost::remove_cv_ref_t<T>, U
>;

} // end namespace boost::mqtt5::detail

#endif // !BOOST_MQTT5_TRAITS_HPP
28 changes: 23 additions & 5 deletions include/boost/mqtt5/impl/codecs/message_encoders.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@

#include <boost/mqtt5/impl/codecs/base_encoders.hpp>

#include <boost/core/span.hpp>

#include <cstdint>
#include <optional>
#include <string>
#include <string_view>
#include <vector>
#include <initializer_list>

namespace boost::mqtt5::encoders {

Expand Down Expand Up @@ -231,7 +233,7 @@ inline std::string encode_pubcomp(

inline std::string encode_subscribe(
uint16_t packet_id,
const std::vector<subscribe_topic>& topics,
boost::span<const subscribe_topic> topics,
const subscribe_props& props
) {

Expand Down Expand Up @@ -270,7 +272,7 @@ inline std::string encode_subscribe(

inline std::string encode_suback(
uint16_t packet_id,
const std::vector<uint8_t>& reason_codes,
boost::span<const uint8_t> reason_codes,
const suback_props& props
) {

Expand All @@ -296,9 +298,17 @@ inline std::string encode_suback(
return s;
}

inline std::string encode_suback(
uint16_t packet_id,
std::initializer_list<uint8_t> reason_codes,
const suback_props& props
) {
return encode_suback(packet_id, std::vector(reason_codes), props);
}

inline std::string encode_unsubscribe(
uint16_t packet_id,
const std::vector<std::string>& topics,
boost::span<const std::string> topics,
const unsubscribe_props& props
) {

Expand Down Expand Up @@ -330,7 +340,7 @@ inline std::string encode_unsubscribe(

inline std::string encode_unsuback(
uint16_t packet_id,
const std::vector<uint8_t>& reason_codes,
boost::span<const uint8_t> reason_codes,
const unsuback_props& props
) {

Expand All @@ -356,6 +366,14 @@ inline std::string encode_unsuback(
return s;
}

inline std::string encode_unsuback(
uint16_t packet_id,
std::initializer_list<uint8_t> reason_codes,
const unsuback_props& props
) {
return encode_unsuback(packet_id, std::vector(reason_codes), props);
}

inline std::string encode_pingreq() {
auto packet_type_ =
basic::flag<4>(0b1100) |
Expand Down
16 changes: 13 additions & 3 deletions include/boost/mqtt5/impl/subscribe_op.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
#include <boost/asio/error.hpp>
#include <boost/asio/prepend.hpp>

#include <boost/core/span.hpp>

#include <cstdint>
#include <memory>
#include <string>
#include <vector>
#include <initializer_list>

namespace boost::mqtt5::detail {

Expand Down Expand Up @@ -91,7 +94,7 @@ class subscribe_op {
}

void perform(
const std::vector<subscribe_topic>& topics,
boost::span<const subscribe_topic> topics,
const subscribe_props& props
) {
_num_topics = topics.size();
Expand Down Expand Up @@ -119,6 +122,13 @@ class subscribe_op {
send_subscribe(std::move(subscribe));
}

void perform(
std::initializer_list<subscribe_topic> topics,
const subscribe_props& props
) {
perform(std::vector(topics), props);
}

void send_subscribe(control_packet<allocator_type> subscribe) {
auto wire_data = subscribe.wire_data();
_svc_ptr->async_send(
Expand Down Expand Up @@ -223,7 +233,7 @@ class subscribe_op {
}

static error_code validate_subscribe(
const std::vector<subscribe_topic>& topics,
boost::span<const subscribe_topic> topics,
const subscribe_props& props, validation_context& ctx
) {
error_code ec;
Expand Down Expand Up @@ -345,7 +355,7 @@ class initiate_async_subscribe {
template <typename Handler>
void operator()(
Handler&& handler,
const std::vector<subscribe_topic>& topics, const subscribe_props& props
span<const subscribe_topic> topics, const subscribe_props& props
) {
detail::subscribe_op { _svc_ptr, std::move(handler) }
.perform(topics, props);
Expand Down
16 changes: 13 additions & 3 deletions include/boost/mqtt5/impl/unsubscribe_op.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
#include <boost/asio/error.hpp>
#include <boost/asio/prepend.hpp>

#include <boost/core/span.hpp>

#include <cstdint>
#include <memory>
#include <string>
#include <vector>
#include <initializer_list>

namespace boost::mqtt5::detail {

Expand Down Expand Up @@ -87,7 +90,7 @@ class unsubscribe_op {
}

void perform(
const std::vector<std::string>& topics,
boost::span<const std::string> topics,
const unsubscribe_props& props
) {
_num_topics = topics.size();
Expand Down Expand Up @@ -115,6 +118,13 @@ class unsubscribe_op {
send_unsubscribe(std::move(unsubscribe));
}

void perform(
std::initializer_list<std::string> topics,
const unsubscribe_props& props
) {
perform(std::vector(topics), props);
}

void send_unsubscribe(control_packet<allocator_type> unsubscribe) {
auto wire_data = unsubscribe.wire_data();
_svc_ptr->async_send(
Expand Down Expand Up @@ -196,7 +206,7 @@ class unsubscribe_op {
private:

static error_code validate_unsubscribe(
const std::vector<std::string>& topics,
boost::span<const std::string> topics,
const unsubscribe_props& props
) {
for (const auto& topic : topics)
Expand Down Expand Up @@ -268,7 +278,7 @@ class initiate_async_unsubscribe {
template <typename Handler>
void operator()(
Handler&& handler,
const std::vector<std::string>& topics, const unsubscribe_props& props
boost::span<const std::string> topics, const unsubscribe_props& props
) {
detail::unsubscribe_op { _svc_ptr, std::move(handler) }
.perform(topics, props);
Expand Down
Loading