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

Merge pull request #216 from kurdybacha/deprecated_draft

Browse Source 
Problem: deprecated poller's add method in draft API
This commit is contained in:
Luca Boccassi 2018-04-26 20:05:02 +01:00 committed by GitHub
commit 99b9967970
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/poller.cpp
View File

@ -265,11 +265,11 @@ TEST(poller, poller_remove_invalid_socket_throws)
TEST(poller, wait_on_added_empty_handler) TEST(poller, wait_on_added_empty_handler)
{ {
server_client_setup s; server_client_setup s;
ASSERT_NO_THROW(s.client.send("Hi")); ASSERT_NO_THROW (s.client.send ("Hi"));
zmq::poller_t poller; zmq::poller_t poller;
std::function<void(void)> handler; zmq::poller_t::handler_t handler;
ASSERT_NO_THROW(poller.add(s.server, ZMQ_POLLIN, handler)); ASSERT_NO_THROW (poller.add (s.server, ZMQ_POLLIN, handler));
ASSERT_NO_THROW(poller.wait(std::chrono::milliseconds{-1})); ASSERT_NO_THROW (poller.wait (std::chrono::milliseconds {-1}));
} }
TEST(poller, modify_empty_throws) TEST(poller, modify_empty_throws)

7
zmq.hpp
View File

@ -1050,13 +1050,6 @@ namespace zmq
using handler_t = std::function<void(short)>; using handler_t = std::function<void(short)>;
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 ? [&handler](short) { handler(); }
: handler_t{});
}
void add (zmq::socket_t &socket, short events, handler_t handler) void add (zmq::socket_t &socket, short events, handler_t handler)
{ {
auto it = std::end (handlers); auto it = std::end (handlers);