Use C++11 right angle brackets.

[cubemap] / server.h

diff --git a/server.h b/server.h
index cb726c6fb818b7f73ce39ec09b2803215e635df6..40e9f7575b708e8d3dc5f9f83268ff7793f6cc04 100644 (file)
--- a/server.h
+++ b/server.h
@@ -84,7 +84,7 @@ private:
        //    can be taken a lot of the time.
        //      
        // Protected by <queued_clients_mutex>.
-       std::vector<std::pair<int, Acceptor *> > queued_add_clients;
+       std::vector<std::pair<int, Acceptor *>> queued_add_clients;
 
        // All variables below this line are protected by the mutex.
        mutable pthread_mutex_t mutex;
@@ -112,7 +112,7 @@ private:
        // This means that when reading it, we need to check if the client it
        // describes is still exists (ie., that the fd still exists, and that
        // the timespec matches).
-       std::queue<std::pair<timespec, int> > clients_ordered_by_connect_time;
+       std::queue<std::pair<timespec, int>> clients_ordered_by_connect_time;
 
        // Used for epoll implementation (obviously).
        int epoll_fd;
@@ -158,6 +158,9 @@ private:
        // Close a given client socket, and clean up after it.
        void close_client(Client *client);
 
+       // Listen for a different set of epoll events.
+       void change_epoll_events(Client *client, uint32_t events);
+
        // Parse the HTTP request. Returns a HTTP status code (200/204/400/404).
        int parse_request(Client *client);