From aed04c7d550b0eac359d6e70cfceece378686a30 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 28 May 2014 12:34:48 +0200 Subject: [PATCH] server cast int to string only where it is needed --- Server/Server.h | 8 ++++++-- Server/ServerFactory.h | 8 +++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Server/Server.h b/Server/Server.h index 54689fee6..be18c3b46 100644 --- a/Server/Server.h +++ b/Server/Server.h @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SERVER_H #define SERVER_H +#include "../Util/StringUtil.h" + #include "Connection.h" #include "RequestHandler.h" @@ -42,12 +44,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. class Server { public: - explicit Server(const std::string &address, const std::string &port, unsigned thread_pool_size) + 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(new http::Connection(io_service, request_handler)), request_handler() { + const std::string port_string = IntToString(port); + boost::asio::ip::tcp::resolver resolver(io_service); - boost::asio::ip::tcp::resolver::query query(address, port); + boost::asio::ip::tcp::resolver::query query(address, port_string); boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query); acceptor.open(endpoint.protocol()); diff --git a/Server/ServerFactory.h b/Server/ServerFactory.h index 91dadbf02..5e037cf05 100644 --- a/Server/ServerFactory.h +++ b/Server/ServerFactory.h @@ -30,7 +30,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "Server.h" #include "../Util/SimpleLogger.h" -#include "../Util/StringUtil.h" #include @@ -41,10 +40,9 @@ struct ServerFactory static Server *CreateServer(std::string &ip_address, int ip_port, unsigned requested_num_threads) { SimpleLogger().Write() << "http 1.1 compression handled by zlib version " << zlibVersion(); - std::string port_stream = IntToString(ip_port); - unsigned hardware_threads = std::max(1u, std::thread::hardware_concurrency()); - unsigned real_num_threads = std::min(hardware_threads, requested_num_threads); - return new Server(ip_address, port_stream, real_num_threads); + const unsigned hardware_threads = std::max(1u, std::thread::hardware_concurrency()); + const unsigned real_num_threads = std::min(hardware_threads, requested_num_threads); + return new Server(ip_address, ip_port, real_num_threads); } };