generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2024-12-12 18:40:28 +01:00
Code Issues Projects Releases Wiki Activity

Disambiguation from other max functions

Browse Source 
Otherwise it creates an error on some environments
This commit is contained in:
Teebonne 2022-10-10 11:19:49 +01:00 committed by GitHub
parent d67b6352b8
commit dc151e2ba6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zmq_addon.hpp
View File

@ -77,7 +77,7 @@ inline bool is_little_endian()
inline void write_network_order(unsigned char *buf, const uint32_t value) inline void write_network_order(unsigned char *buf, const uint32_t value)
{ {
if (is_little_endian()) { if (is_little_endian()) {
ZMQ_CONSTEXPR_VAR uint32_t mask = std::numeric_limits<std::uint8_t>::max(); ZMQ_CONSTEXPR_VAR uint32_t mask = (std::numeric_limits<std::uint8_t>::max)();
*buf++ = static_cast<unsigned char>((value >> 24) & mask); *buf++ = static_cast<unsigned char>((value >> 24) & mask);
*buf++ = static_cast<unsigned char>((value >> 16) & mask); *buf++ = static_cast<unsigned char>((value >> 16) & mask);
*buf++ = static_cast<unsigned char>((value >> 8) & mask); *buf++ = static_cast<unsigned char>((value >> 8) & mask);
@ -224,12 +224,12 @@ message_t encode(const Range &parts)
// First pass check sizes // First pass check sizes
for (const auto &part : parts) { for (const auto &part : parts) {
const size_t part_size = part.size(); const size_t part_size = part.size();
if (part_size > std::numeric_limits<std::uint32_t>::max()) { if (part_size > (std::numeric_limits<std::uint32_t>::max)()) {
// Size value must fit into uint32_t. // Size value must fit into uint32_t.
throw std::range_error("Invalid size, message part too large"); throw std::range_error("Invalid size, message part too large");
} }
const size_t count_size = const size_t count_size =
part_size < std::numeric_limits<std::uint8_t>::max() ? 1 : 5; part_size < (std::numeric_limits<std::uint8_t>::max)() ? 1 : 5;
mmsg_size += part_size + count_size; mmsg_size += part_size + count_size;
} }
@ -240,12 +240,12 @@ message_t encode(const Range &parts)
const unsigned char *part_data = const unsigned char *part_data =
static_cast<const unsigned char *>(part.data()); static_cast<const unsigned char *>(part.data());
if (part_size < std::numeric_limits<std::uint8_t>::max()) { if (part_size < (std::numeric_limits<std::uint8_t>::max)()) {
// small part // small part
*buf++ = (unsigned char) part_size; *buf++ = (unsigned char) part_size;
} else { } else {
// big part // big part
*buf++ = std::numeric_limits<uint8_t>::max(); *buf++ = (std::numeric_limits<uint8_t>::max)();
detail::write_network_order(buf, part_size); detail::write_network_order(buf, part_size);
buf += sizeof(part_size); buf += sizeof(part_size);
} }
@ -279,7 +279,7 @@ template<class OutputIt> OutputIt decode(const message_t &encoded, OutputIt out)
while (source < limit) { while (source < limit) {
size_t part_size = *source++; size_t part_size = *source++;
if (part_size == std::numeric_limits<std::uint8_t>::max()) { if (part_size == (std::numeric_limits<std::uint8_t>::max)()) {
if (static_cast<size_t>(limit - source) < sizeof(uint32_t)) { if (static_cast<size_t>(limit - source) < sizeof(uint32_t)) {
throw std::out_of_range( throw std::out_of_range(
"Malformed encoding, overflow in reading size"); "Malformed encoding, overflow in reading size");