Use C++11 features with containers

[libs/core.git] / source / io / unix / poll.cpp

diff --git a/source/io/unix/poll.cpp b/source/io/unix/poll.cpp
index 0fb9d22e03919476e95d52e09ca5faf10088241f..28d3aebc5acba72970c0176a2b17581d4cf168ab 100644 (file)
--- 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(PolledObject(objects[i].object, poll_event_from_sys(priv->pfd[i].revents)));
                        --ret;
                }
 }