Skip to content

Use send_flags and recv_flags instead of int in multipart_t #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Use send_flags and recv_flags instead of int in multipart_t #649

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions zmq_addon.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<recv_flags>(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<recv_flags>(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<send_flags>(
(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<send_flags>(flags));
}

// Concatenate other multipart to front
void prepend(multipart_t &&other)
{
Expand Down
Loading