generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-04-28 02:33:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #328 from xiphon/fix-recv-flags-default

Browse Source 
Fix 'recv' function 'flags_' argument default value
This commit is contained in:
Simon Giesecke 2019-07-24 14:42:31 +02:00 committed by GitHub
commit 86876d7307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/socket.cpp
View File

@ -198,6 +198,25 @@ TEST_CASE("socket send recv message_t", "[socket]")
CHECK(rmsg.size() == *res); CHECK(rmsg.size() == *res);
} }
TEST_CASE("socket send recv message_t by pointer", "[socket]")
{
zmq::context_t context;
zmq::socket_t s(context, zmq::socket_type::pair);
zmq::socket_t s2(context, zmq::socket_type::pair);
s2.bind("inproc://test");
s.connect("inproc://test");
zmq::message_t smsg(size_t{10});
const auto res_send = s2.send(smsg, zmq::send_flags::none);
CHECK(res_send);
CHECK(*res_send == 10);
CHECK(smsg.size() == 0);
zmq::message_t rmsg;
const bool res = s.recv(&rmsg);
CHECK(res);
}
TEST_CASE("socket recv dontwait", "[socket]") TEST_CASE("socket recv dontwait", "[socket]")
{ {
zmq::context_t context; zmq::context_t context;

6
zmq.hpp
View File

@ -1264,11 +1264,7 @@ public:
#ifdef ZMQ_CPP11 #ifdef ZMQ_CPP11
ZMQ_DEPRECATED("from 4.3.1, use recv taking a reference to message_t and recv_flags") ZMQ_DEPRECATED("from 4.3.1, use recv taking a reference to message_t and recv_flags")
#endif #endif
bool recv(message_t *msg_, int flags_ bool recv(message_t *msg_, int flags_ = 0)
#ifndef ZMQ_CPP11
= 0
#endif
)
{ {
int nbytes = zmq_msg_recv(msg_->handle(), _handle, flags_); int nbytes = zmq_msg_recv(msg_->handle(), _handle, flags_);
if (nbytes >= 0) if (nbytes >= 0)