Use C++11 range-based for loops and auto wherever it makes sense.

[cubemap] / serverpool.cpp

diff --git a/serverpool.cpp b/serverpool.cpp
index 3e79b45ba41d065aa19021efe549eb1b65c08be6..85561278e6222995f7f863ed48e6a03424597686 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -26,8 +26,8 @@ ServerPool::~ServerPool()
 {
        delete[] servers;
 
-       for (size_t i = 0; i < udp_streams.size(); ++i) {
-               delete udp_streams[i];
+       for (UDPStream *udp_stream : udp_streams) {
+               delete udp_stream;
        }
 }
        
@@ -49,17 +49,17 @@ CubemapStateProto ServerPool::serialize()
                                state.mutable_streams(j)->add_data_fds(local_state.streams(j).data_fds(0));
                        }
                }
-               for (int j = 0; j < local_state.clients_size(); ++j) {
-                       state.add_clients()->MergeFrom(local_state.clients(j));
+               for (const ClientProto &client : local_state.clients()) {
+                       state.add_clients()->MergeFrom(client);
                }
         }
 
        return state;
 }
 
-void ServerPool::add_client(int sock)
+void ServerPool::add_client(int sock, Acceptor *acceptor)
 {
-       servers[clients_added++ % num_servers].add_client_deferred(sock);
+       servers[clients_added++ % num_servers].add_client_deferred(sock, acceptor);
 }
 
 void ServerPool::add_client_from_serialized(const ClientProto &client)
@@ -170,6 +170,13 @@ void ServerPool::add_gen204(const std::string &url, const std::string &allow_ori
        }
 }
 
+void ServerPool::create_tls_context_for_acceptor(const Acceptor *acceptor)
+{
+       for (int i = 0; i < num_servers; ++i) {
+               servers[i].create_tls_context_for_acceptor(acceptor);
+       }
+}
+
 void ServerPool::run()
 {
        for (int i = 0; i < num_servers; ++i) {