From 5d65a5d89b258571e8cec5a09062f4f21fdea93d Mon Sep 17 00:00:00 2001 From: eidheim Date: Wed, 26 Aug 2020 11:43:28 +0200 Subject: [PATCH] Fixes another compilation issue: make_steady_timer now returns std::unique_ptr --- asio_compatibility.hpp | 8 ++++---- client_http.hpp | 2 +- server_http.hpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/asio_compatibility.hpp b/asio_compatibility.hpp index 9f1060c..c2e0b66 100644 --- a/asio_compatibility.hpp +++ b/asio_compatibility.hpp @@ -43,8 +43,8 @@ namespace SimpleWeb { return asio::ip::make_address(str); } template - asio::steady_timer make_steady_timer(socket_type &socket, std::chrono::duration duration) { - return asio::steady_timer(socket.get_executor(), duration); + std::unique_ptr make_steady_timer(socket_type &socket, std::chrono::duration duration) { + return std::unique_ptr(new asio::steady_timer(socket.get_executor(), duration)); } template void async_resolve(asio::ip::tcp::resolver &resolver, const std::pair &host_port, handler_type &&handler) { @@ -69,8 +69,8 @@ namespace SimpleWeb { return asio::ip::address::from_string(str); } template - asio::steady_timer make_steady_timer(socket_type &socket, std::chrono::duration duration) { - return asio::steady_timer(socket.get_io_service(), duration); + std::unique_ptr make_steady_timer(socket_type &socket, std::chrono::duration duration) { + return std::unique_ptr(new asio::steady_timer(socket.get_io_service(), duration)); } template void async_resolve(asio::ip::tcp::resolver &resolver, const std::pair &host_port, handler_type &&handler) { diff --git a/client_http.hpp b/client_http.hpp index 0b6b866..163893c 100644 --- a/client_http.hpp +++ b/client_http.hpp @@ -173,7 +173,7 @@ namespace SimpleWeb { timer = nullptr; return; } - timer = std::unique_ptr(new asio::steady_timer(make_steady_timer(*socket, std::chrono::seconds(seconds)))); + timer = make_steady_timer(*socket, std::chrono::seconds(seconds)); std::weak_ptr self_weak(this->shared_from_this()); // To avoid keeping Connection instance alive longer than needed timer->async_wait([self_weak](const error_code &ec) { if(!ec) { diff --git a/server_http.hpp b/server_http.hpp index 698fb43..195249b 100644 --- a/server_http.hpp +++ b/server_http.hpp @@ -303,7 +303,7 @@ namespace SimpleWeb { return; } - timer = std::unique_ptr(new asio::steady_timer(make_steady_timer(*socket, std::chrono::seconds(seconds)))); + timer = make_steady_timer(*socket, std::chrono::seconds(seconds)); std::weak_ptr self_weak(this->shared_from_this()); // To avoid keeping Connection instance alive longer than needed timer->async_wait([self_weak](const error_code &ec) { if(!ec) {