From 7a3748b8f63007f02f72110a08541feb8bef2229 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 26 Jan 2015 16:34:05 +0100 Subject: [PATCH] remove redundant c'tor call --- Server/Server.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Server/Server.h b/Server/Server.h index 8e0b10130..0098dd5a5 100644 --- a/Server/Server.h +++ b/Server/Server.h @@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "RequestHandler.h" #include "../Util/cast.hpp" -#include "../Util/make_unique.hpp" +#include "../Util/integer_range.hpp" #include "../Util/simple_logger.hpp" #include @@ -48,9 +48,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. class Server { public: - // Note: returns a shared instead of a unique ptr as it is captured in a lambda somewhere else - static std::shared_ptr CreateServer(std::string &ip_address, int ip_port, unsigned requested_num_threads) + static std::shared_ptr + CreateServer(std::string &ip_address, int ip_port, unsigned requested_num_threads) { SimpleLogger().Write() << "http 1.1 compression handled by zlib version " << zlibVersion(); const unsigned hardware_threads = std::max(1u, std::thread::hardware_concurrency()); @@ -60,7 +60,7 @@ class Server explicit Server(const std::string &address, const int port, const unsigned thread_pool_size) : thread_pool_size(thread_pool_size), acceptor(io_service), - new_connection(std::make_shared(io_service, request_handler)), request_handler() + new_connection(std::make_shared(io_service, request_handler)) { const std::string port_string = cast::integral_to_string(port);