jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compilation issue with standalone Asio: https://gitlab.com/eidheim/Simple-WebSocket-Server/-/issues/151

Browse source
This commit is contained in:
eidheim 2020-08-26 11:18:12 +02:00
commit 4c57860d7e
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
asio_compatibility.hpp
View file

@ -42,9 +42,9 @@ namespace SimpleWeb {
inline asio::ip::address make_address(const std::string &str) noexcept { inline asio::ip::address make_address(const std::string &str) noexcept {
return asio::ip::make_address(str); return asio::ip::make_address(str);
} }
template <typename socket_type> template <typename socket_type, typename duration_type>
asio::executor get_socket_executor(socket_type &socket) { asio::steady_timer make_steady_timer(socket_type &socket, std::chrono::duration<duration_type> duration) {
return socket.get_executor(); return asio::steady_timer(socket.get_executor(), duration);
} }
template <typename handler_type> template <typename handler_type>
void async_resolve(asio::ip::tcp::resolver &resolver, const std::pair<std::string, std::string> &host_port, handler_type &&handler) { void async_resolve(asio::ip::tcp::resolver &resolver, const std::pair<std::string, std::string> &host_port, handler_type &&handler) {

2
client_http.hpp
View file

@ -173,7 +173,7 @@ namespace SimpleWeb {
timer = nullptr; timer = nullptr;
return; return;
} }
timer = std::unique_ptr<asio::steady_timer>(new asio::steady_timer(get_socket_executor(*socket), std::chrono::seconds(seconds))); timer = std::unique_ptr<asio::steady_timer>(new asio::steady_timer(make_steady_timer(*socket, std::chrono::seconds(seconds))));
std::weak_ptr<Connection> self_weak(this->shared_from_this()); // To avoid keeping Connection instance alive longer than needed std::weak_ptr<Connection> self_weak(this->shared_from_this()); // To avoid keeping Connection instance alive longer than needed
timer->async_wait([self_weak](const error_code &ec) { timer->async_wait([self_weak](const error_code &ec) {
if(!ec) { if(!ec) {

2
server_http.hpp
View file

@ -303,7 +303,7 @@ namespace SimpleWeb {
return; return;
} }
timer = std::unique_ptr<asio::steady_timer>(new asio::steady_timer(get_socket_executor(*socket), std::chrono::seconds(seconds))); timer = std::unique_ptr<asio::steady_timer>(new asio::steady_timer(make_steady_timer(*socket, std::chrono::seconds(seconds))));
std::weak_ptr<Connection> self_weak(this->shared_from_this()); // To avoid keeping Connection instance alive longer than needed std::weak_ptr<Connection> self_weak(this->shared_from_this()); // To avoid keeping Connection instance alive longer than needed
timer->async_wait([self_weak](const error_code &ec) { timer->async_wait([self_weak](const error_code &ec) {
if(!ec) { if(!ec) {