generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-03-01 10:57:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #211 from kurdybacha/add_throws

Browse Source 
Problem: poller_t's deprecated add might throw std::bad_function_call
This commit is contained in:
Simon Giesecke 2018-04-20 08:50:34 +02:00 committed by GitHub
commit d103401ec3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/poller.cpp
View File

@ -252,4 +252,19 @@ TEST(poller, poller_remove_invalid_socket_throws)
ASSERT_EQ (1u, poller.size ());
}
TEST(poller, wait_on_added_empty_handler)
{
zmq::context_t context;
zmq::socket_t vent{context, zmq::socket_type::push};
auto endpoint = loopback_ip4_binder(vent).endpoint();
zmq::socket_t sink{context, zmq::socket_type::pull};
ASSERT_NO_THROW(sink.connect(endpoint));
ASSERT_NO_THROW(vent.send("Hi"));
zmq::poller_t poller;
std::function<void(void)> handler;
ASSERT_NO_THROW(poller.add(sink, ZMQ_POLLIN, handler));
ASSERT_NO_THROW(poller.wait(std::chrono::milliseconds{-1}));
}
#endif

3
zmq.hpp
View File

@ -1053,7 +1053,8 @@ namespace zmq
ZMQ_DEPRECATED("from 4.3.0, use overload accepting handler_t instead")
void add (zmq::socket_t &socket, short events, std::function<void(void)> &handler)
{
add (socket, events, [&handler](short) { handler(); });
add (socket, events, handler ? [&handler](short) { handler(); }
: handler_t{});
}
void add (zmq::socket_t &socket, short events, handler_t handler)