Prefer range-based for loops where possible

[libs/net.git] / source / http / server.cpp

diff --git a/source/http/server.cpp b/source/http/server.cpp
index 667403e86788c9228e179e1f9677feb1552fb6cc..6055f008e4ff13328a6bf5409584a7e96f682458 100644 (file)
--- a/source/http/server.cpp
+++ b/source/http/server.cpp
@@ -54,15 +54,15 @@ void Server::use_event_dispatcher(IO::EventDispatcher *ed)
        if(event_disp)
        {
                event_disp->remove(sock);
-               for(list<Client>::iterator i=clients.begin(); i!=clients.end(); ++i)
-                       event_disp->remove(*i->sock);
+               for(Client &c: clients)
+                       event_disp->remove(*c.sock);
        }
        event_disp = ed;
        if(event_disp)
        {
                event_disp->add(sock);
-               for(list<Client>::iterator i=clients.begin(); i!=clients.end(); ++i)
-                       event_disp->add(*i->sock);
+               for(Client &c: clients)
+                       event_disp->add(*c.sock);
        }
 }
 
@@ -86,18 +86,17 @@ void Server::cancel_keepalive(Response &resp)
 void Server::close_connections(const Time::TimeDelta &timeout)
 {
        IO::Poller poller;
-       for(list<Client>::iterator i=clients.begin(); i!=clients.end(); ++i)
+       for(Client &c: clients)
        {
-               i->sock->shutdown(IO::M_WRITE);
-               poller.set_object(*i->sock, IO::P_INPUT);
+               c.sock->shutdown(IO::M_WRITE);
+               poller.set_object(*c.sock, IO::P_INPUT);
        }
 
        while(!clients.empty() && poller.poll(timeout))
        {
-               const vector<IO::Poller::PolledObject> &result = poller.get_result();
-               for(vector<IO::Poller::PolledObject>::const_iterator i=result.begin(); i!=result.end(); ++i)
+               for(const IO::Poller::PolledObject &p: poller.get_result())
                        for(list<Client>::iterator j=clients.begin(); j!=clients.end(); ++j)
-                               if(j->sock.get()==i->object)
+                               if(j->sock.get()==p.object)
                                {
                                        poller.set_object(*j->sock, IO::P_NONE);
                                        clients.erase(j);