Skip to content

Commit 19b5222

Browse files
committed
Fix 'recv' function 'flags_' argument default value
1 parent 0672e31 commit 19b5222

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

tests/socket.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,25 @@ TEST_CASE("socket send recv message_t", "[socket]")
198198
CHECK(rmsg.size() == *res);
199199
}
200200

201+
TEST_CASE("socket send recv message_t by pointer", "[socket]")
202+
{
203+
zmq::context_t context;
204+
zmq::socket_t s(context, zmq::socket_type::pair);
205+
zmq::socket_t s2(context, zmq::socket_type::pair);
206+
s2.bind("inproc://test");
207+
s.connect("inproc://test");
208+
209+
zmq::message_t smsg(size_t{10});
210+
const auto res_send = s2.send(smsg, zmq::send_flags::none);
211+
CHECK(res_send);
212+
CHECK(*res_send == 10);
213+
CHECK(smsg.size() == 0);
214+
215+
zmq::message_t rmsg;
216+
const bool res = s.recv(&rmsg);
217+
CHECK(res);
218+
}
219+
201220
TEST_CASE("socket recv dontwait", "[socket]")
202221
{
203222
zmq::context_t context;

zmq.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,11 +1212,7 @@ class socket_base
12121212
#ifdef ZMQ_CPP11
12131213
ZMQ_DEPRECATED("from 4.3.1, use recv taking a reference to message_t and recv_flags")
12141214
#endif
1215-
bool recv(message_t *msg_, int flags_
1216-
#ifndef ZMQ_CPP11
1217-
= 0
1218-
#endif
1219-
)
1215+
bool recv(message_t *msg_, int flags_ = 0)
12201216
{
12211217
int nbytes = zmq_msg_recv(msg_->handle(), _handle, flags_);
12221218
if (nbytes >= 0)

0 commit comments

Comments
 (0)