From 8d2593119a04e6b30d5c36a722a77ee32f1d454b Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 19 Apr 2013 21:08:08 +0200 Subject: [PATCH] Remove unneeded default Client constructor. --- client.h | 1 - server.cpp | 15 ++++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/client.h b/client.h index d511698..9a189c0 100644 --- a/client.h +++ b/client.h @@ -23,7 +23,6 @@ struct ClientStats { }; struct Client { - Client() {} Client(int sock); // Serialization/deserialization. diff --git a/server.cpp b/server.cpp index a000d9c..b5f58d4 100644 --- a/server.cpp +++ b/server.cpp @@ -147,18 +147,21 @@ void Server::add_client_deferred(int sock) void Server::add_client(int sock) { - clients.insert(make_pair(sock, Client(sock))); + pair::iterator, bool> ret = + clients.insert(make_pair(sock, Client(sock))); + assert(ret.second == true); // Should not already exist. + Client *client_ptr = &ret.first->second; // Start listening on data from this socket. epoll_event ev; ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP; - ev.data.u64 = reinterpret_cast(&clients[sock]); + ev.data.u64 = reinterpret_cast(client_ptr); if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev) == -1) { log_perror("epoll_ctl(EPOLL_CTL_ADD)"); exit(1); } - process_client(&clients[sock]); + process_client(client_ptr); } void Server::add_client_from_serialized(const ClientProto &client) @@ -171,8 +174,10 @@ void Server::add_client_from_serialized(const ClientProto &client) } else { stream = stream_it->second; } - clients.insert(make_pair(client.sock(), Client(client, stream))); - Client *client_ptr = &clients[client.sock()]; + pair::iterator, bool> ret = + clients.insert(make_pair(client.sock(), Client(client, stream))); + assert(ret.second == true); // Should not already exist. + Client *client_ptr = &ret.first->second; // Start listening on data from this socket. epoll_event ev; -- 2.39.2