0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-26 23:01:04 +08:00

Merge pull request #2131 from minrk/poller-static-2

pass through poller events
This commit is contained in:
Doron Somech 2016-09-27 16:00:37 +03:00 committed by GitHub
commit 131a2627b9

View File

@ -1243,16 +1243,8 @@ int zmq_poller_wait_all (void *poller_, zmq_poller_event_t *events, int n_events
}
zmq_assert (events != NULL);
zmq::socket_poller_t::event_t evts[n_events];
int rc = ((zmq::socket_poller_t*)poller_)->wait (evts, n_events, timeout_);
for(int i = 0; i < n_events; ++i) {
events[i].socket = evts[i].socket;
events[i].fd = evts[i].fd;
events[i].user_data = evts[i].user_data;
events[i].events = evts[i].events;
}
int rc = ((zmq::socket_poller_t*)poller_)->wait ((zmq::socket_poller_t::event_t *)events, n_events, timeout_);
return rc;
}