X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Funix%2Fpoll.cpp;h=e3db10eae1cf215906b70d40456ce89a52d9ab5a;hb=HEAD;hp=0fb9d22e03919476e95d52e09ca5faf10088241f;hpb=292aed8e23ea543b089d5f2a73000de4640befe7;p=libs%2Fcore.git

diff --git a/source/io/unix/poll.cpp b/source/io/unix/poll.cpp
index 0fb9d22..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<Slot>::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; (i<objects.size() && ret>0); ++i)
 		if(priv->pfd[i].revents)
 		{
-			poll_result.push_back(Slot(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;
 		}
 }