...
This commit is contained in:
@@ -380,8 +380,17 @@ struct netproto_binary_blob_t {
|
||||
} else if constexpr (output_char_range_c<OR>) {
|
||||
if constexpr (!fixed_size_range_c<OR>) {
|
||||
if constexpr (std::constructible_from<OR, std::ranges::iterator_t<inp_t>,
|
||||
std::ranges::iterator_t<inp_t>>) {
|
||||
std::ranges::iterator_t<inp_t>> ||
|
||||
std::constructible_from<OR, std::ranges::iterator_t<inp_t>,
|
||||
std::ranges::sentinel_t<inp_t>>) {
|
||||
res.result = OR(it_start, it_end); // return without blob size field!!!
|
||||
} else if constexpr (std::constructible_from<OR, std::ranges::const_iterator_t<inp_t>,
|
||||
std::ranges::const_iterator_t<inp_t>> ||
|
||||
std::constructible_from<OR, std::ranges::const_iterator_t<inp_t>,
|
||||
std::ranges::const_sentinel_t<inp_t>>) {
|
||||
res.result = OR(it_start, it_end); // return without blob size field!!!
|
||||
} else if constexpr (std::same_as<std::span<char>, OR> || std::same_as<std::span<const char>, OR>) {
|
||||
res.result = OR{bytes.data(), bytes.size()}; // return without blob size field!!!
|
||||
} else if constexpr (std::is_default_constructible_v<OR>) {
|
||||
std::ranges::copy(
|
||||
std::forward<IR>(bytes) | std::views::drop(BLOB_SIZE_FIELD) | std::views::take(blob_sz.value()),
|
||||
@@ -430,8 +439,8 @@ struct netproto_binary_blob_t {
|
||||
// net_repr_proto_result_t<std::ranges::subrange<std::ranges::iterator_t<IR>, std::ranges::sentinel_t<IR>>>>
|
||||
{
|
||||
if constexpr (std::ranges::contiguous_range<IR>) {
|
||||
// return fromNetwork<std::span<std::ranges::range_value_t<IR>>>(std::forward<IR>(bytes));
|
||||
return fromNetwork<std::string_view>(std::forward<IR>(bytes));
|
||||
return fromNetwork<std::span<std::ranges::range_value_t<IR>>>(std::forward<IR>(bytes));
|
||||
// return fromNetwork<std::string_view>(std::forward<IR>(bytes));
|
||||
} else {
|
||||
return fromNetwork<std::ranges::subrange<std::ranges::iterator_t<IR>, std::ranges::sentinel_t<IR>>>(
|
||||
std::forward<IR>(bytes));
|
||||
|
||||
@@ -224,7 +224,9 @@ public:
|
||||
break;
|
||||
}
|
||||
|
||||
// message must be created from a DEEP-COPY of the input byte sequence!!!
|
||||
|
||||
msg = net_connection_t::message_t::fromBytes(msg_bytes.result);
|
||||
|
||||
// remove only used bytes
|
||||
_recvStreamBuffer->consume(msg_bytes.bytes_used);
|
||||
|
||||
Reference in New Issue
Block a user