From 9c1da761d68495f37acb830c5854d392a4045f18 Mon Sep 17 00:00:00 2001 From: Stephan Lachnit Date: Sat, 22 Feb 2025 13:15:25 +0100 Subject: [PATCH] Use send_flags and recv_flags instead of int in multipart_t --- zmq_addon.hpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/zmq_addon.hpp b/zmq_addon.hpp index d92a56da..9e231f68 100644 --- a/zmq_addon.hpp +++ b/zmq_addon.hpp @@ -451,46 +451,46 @@ class multipart_t bool empty() const { return m_parts.empty(); } // Receive multipart message from socket - bool recv(socket_ref socket, int flags = 0) + bool recv(socket_ref socket, recv_flags flags = recv_flags::none) { clear(); bool more = true; while (more) { message_t message; -#ifdef ZMQ_CPP11 - if (!socket.recv(message, static_cast(flags))) - return false; -#else if (!socket.recv(&message, flags)) return false; -#endif more = message.more(); add(std::move(message)); } return true; } + // Receive multipart message from socket (old) + bool recv(socket_ref socket, int flags = 0) { + return recv(socket, static_cast(flags)); + } + // Send multipart message to socket - bool send(socket_ref socket, int flags = 0) + bool send(socket_ref socket, send_flags flags = send_flags::none) { flags &= ~(ZMQ_SNDMORE); bool more = size() > 0; while (more) { message_t message = pop(); more = size() > 0; -#ifdef ZMQ_CPP11 - if (!socket.send(message, static_cast( - (more ? ZMQ_SNDMORE : 0) | flags))) - return false; -#else if (!socket.send(message, (more ? ZMQ_SNDMORE : 0) | flags)) return false; -#endif } clear(); return true; } + // Send multipart message to socket (old) + bool send(socket_ref socket, int flags = 0) + { + return send(socket, static_cast(flags)); + } + // Concatenate other multipart to front void prepend(multipart_t &&other) {