diff options
author | Matteo Bernardini | 2020-02-24 11:30:13 +0100 |
---|---|---|
committer | Matteo Bernardini | 2020-02-24 11:30:13 +0100 |
commit | 27811f4c33fd0b9a2e7ea64a4fbf4969d4e56bd4 (patch) | |
tree | 3887c02a1345299dccb436665f332db2411deec8 /games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix2.patch | |
parent | 5de2bc5ab8f479fb924d4c5b543c6e0a37999431 (diff) | |
download | slackbuilds-27811f4c33fd0b9a2e7ea64a4fbf4969d4e56bd4.tar.gz |
20200224.1 global branch merge.current-20200224.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix2.patch')
-rw-r--r-- | games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix2.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix2.patch b/games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix2.patch new file mode 100644 index 0000000000..64faab9d37 --- /dev/null +++ b/games/pokerth/pokerth-1.1.2-boost-1.70-websocket-fix2.patch @@ -0,0 +1,52 @@ +From f810ca2e800e9b55be41c5911cf1d1185fcd516b Mon Sep 17 00:00:00 2001 +From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> +Date: Wed, 17 Apr 2019 10:06:18 +0000 +Subject: [PATCH] Fix missed entries; fix testing + +(Note: the CmakeLists.txt patch is cut off because we don't have it) + +--- + CMakeLists.txt | 2 +- + websocketpp/transport/asio/connection.hpp | 3 +-- + websocketpp/transport/asio/endpoint.hpp | 7 ++----- + 3 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp +index 1ccda8f3..57dda74a 100644 +--- a/websocketpp/transport/asio/connection.hpp ++++ b/websocketpp/transport/asio/connection.hpp +@@ -462,8 +462,7 @@ class connection : public config::socket_type::socket_con_type { + m_io_service = io_service; + + if (config::enable_multithreading) { +- m_strand = lib::make_shared<lib::asio::io_service::strand>( +- lib::ref(*io_service)); ++ m_strand.reset(new lib::asio::io_service::strand(*io_service)); + } + + lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, +diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +index 4b719a97..94509adb 100644 +--- a/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -687,9 +687,7 @@ class endpoint : public config::socket_type { + * @since 0.3.0 + */ + void start_perpetual() { +- m_work = lib::make_shared<lib::asio::io_service::work>( +- lib::ref(*m_io_service) +- ); ++ m_work.reset(new lib::asio::io_service::work(*m_io_service)); + } + + /// Clears the endpoint's perpetual flag, allowing it to exit when empty +@@ -853,8 +851,7 @@ class endpoint : public config::socket_type { + + // Create a resolver + if (!m_resolver) { +- m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>( +- lib::ref(*m_io_service)); ++ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); + } + + tcon->set_uri(u); |