X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Funix%2Fpoll.cpp;h=e3db10eae1cf215906b70d40456ce89a52d9ab5a;hb=HEAD;hp=7df113e539609238e56d64bfd90662c0449c9af4;hpb=242a4a9abe1e1113b5eb39aa751aa054f696d7be;p=libs%2Fcore.git diff --git a/source/io/unix/poll.cpp b/source/io/unix/poll.cpp index 7df113e..e3db10e 100644 --- a/source/io/unix/poll.cpp +++ b/source/io/unix/poll.cpp @@ -62,11 +62,11 @@ void Poller::rebuild_array() priv->pfd.clear(); priv->pfd.reserve(objects.size()); - for(vector::const_iterator i=objects.begin(); i!=objects.end(); ++i) + for(const PolledObject &po: objects) { pollfd p; - p.fd = *i->object->get_event_handle(); - p.events = sys_poll_event(i->events); + p.fd = *po.object->get_event_handle(); + p.events = sys_poll_event(po.events); priv->pfd.push_back(p); } } @@ -91,7 +91,7 @@ void Poller::platform_poll(int timeout) for(unsigned i=0; (i0); ++i) if(priv->pfd[i].revents) { - poll_result.push_back(PolledObject(objects[i].object, poll_event_from_sys(priv->pfd[i].revents))); + poll_result.push_back({ objects[i].object, poll_event_from_sys(priv->pfd[i].revents) }); --ret; } }