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

diff --git a/source/io/windows/poll.cpp b/source/io/windows/poll.cpp
index b3ee8ec..0d644cd 100644
--- a/source/io/windows/poll.cpp
+++ b/source/io/windows/poll.cpp
@@ -18,8 +18,8 @@ void Poller::rebuild_array()
 	priv->handles.clear();
 	priv->handles.reserve(objects.size());
 
-	for(vector<Slot>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-		priv->handles.push_back(*i->object->get_event_handle());
+	for(const PolledObject &po: objects)
+		priv->handles.push_back(*po.object->get_event_handle());
 }
 
 void Poller::platform_poll(int timeout)
@@ -30,8 +30,8 @@ void Poller::platform_poll(int timeout)
 	DWORD ret = WaitForMultipleObjects(priv->handles.size(), &priv->handles.front(), false, timeout);
 	if(/*ret>=WAIT_OBJECT_0 &&*/ ret<WAIT_OBJECT_0+priv->handles.size())
 	{
-		const Slot &slot = objects[ret-WAIT_OBJECT_0];
-		poll_result.push_back(slot);
+		const PolledObject &obj = objects[ret-WAIT_OBJECT_0];
+		poll_result.push_back(obj);
 	}
 	else if(ret==WAIT_FAILED)
 		throw system_error("WaitForMultipleObjects");