Skip to content

Commit

Permalink
websocketpp: add patch for boost 1.70+
Browse files Browse the repository at this point in the history
  • Loading branch information
Johnnynator committed Jan 25, 2020
1 parent 4a5cb7a commit 0e425e4
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 1 deletion.
62 changes: 62 additions & 0 deletions srcpkgs/websocketpp/patches/boost-1.70.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
https://github.com/zaphoyd/websocketpp/issues/794

--- websocketpp/transport/asio/connection.hpp.orig 2018-07-16 12:40:53 UTC
+++ websocketpp/transport/asio/connection.hpp
@@ -312,7 +312,7 @@ class connection : public config::socket_type::socket_
*/
timer_ptr set_timer(long duration, timer_handler callback) {
timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
- lib::ref(*m_io_service),
+ *m_io_service,
lib::asio::milliseconds(duration)
);

@@ -462,7 +462,7 @@ class connection : public config::socket_type::socket_

if (config::enable_multithreading) {
m_strand = lib::make_shared<lib::asio::io_service::strand>(
- lib::ref(*io_service));
+ *io_service);
}

lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
--- websocketpp/transport/asio/endpoint.hpp.orig 2018-07-16 12:40:53 UTC
+++ websocketpp/transport/asio/endpoint.hpp
@@ -196,7 +196,7 @@ class endpoint : public config::socket_type { (public)
m_io_service = ptr;
m_external_io_service = true;
m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
- lib::ref(*m_io_service));
+ *m_io_service);

m_state = READY;
ec = lib::error_code();
@@ -689,7 +689,7 @@ class endpoint : public config::socket_type { (public)
*/
void start_perpetual() {
m_work = lib::make_shared<lib::asio::io_service::work>(
- lib::ref(*m_io_service)
+ *m_io_service
);
}

@@ -855,7 +855,7 @@ class endpoint : public config::socket_type { (public)
// Create a resolver
if (!m_resolver) {
m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
- lib::ref(*m_io_service));
+ *m_io_service);
}

tcon->set_uri(u);
--- websocketpp/transport/asio/security/none.hpp.orig 2018-07-16 12:40:53 UTC
+++ websocketpp/transport/asio/security/none.hpp
@@ -169,7 +169,7 @@ class connection : public lib::enable_shared_from_this
}

m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
- lib::ref(*service));
+ *service);

if (m_socket_init_handler) {
m_socket_init_handler(m_hdl, *m_socket);
2 changes: 1 addition & 1 deletion srcpkgs/websocketpp/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'websocketpp'
pkgname=websocketpp
version=0.8.1
revision=1
revision=2
build_style=cmake
short_desc="C++/Boost Asio based websocket client/server library"
maintainer="Duncaen <duncaen@voidlinux.org>"
Expand Down

0 comments on commit 0e425e4

Please sign in to comment.