Use C++11 std::mutex and std::lock_guard instead of our RAII wrapper.

[cubemap] / serverpool.cpp

diff --git a/serverpool.cpp b/serverpool.cpp
index 1414d219909407c1ca2574ca581cc46179a5483d..a5c8a72ffc0ae7726a1413d3f071cb06666bf6d3 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -16,9 +16,7 @@ using namespace std;
 
 ServerPool::ServerPool(int size)
        : servers(new Server[size]),
-         num_servers(size),
-         clients_added(0),
-         num_http_streams(0)
+         num_servers(size)
 {
 }
 
@@ -60,7 +58,7 @@ void ServerPool::add_client_from_serialized(const ClientProto &client)
 
 int ServerPool::lookup_stream_by_url(const string &url) const
 {
-       assert(servers != NULL);
+       assert(servers != nullptr);
        return servers[0].lookup_stream_by_url(url);
 }