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

diff --git a/source/io/windows/poll.cpp b/source/io/windows/poll.cpp
index b3ee8ec..cbd92fd 100644
--- a/source/io/windows/poll.cpp
+++ b/source/io/windows/poll.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/except.h>
 #include <msp/core/systemerror.h>
 #include "eventobject.h"
 #include "handle.h"
@@ -18,8 +19,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 +31,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");