Attachment #202932 for bug #236589

View | Details | Raw Unified | Return to bug 236589
Collapse All | Expand All




https://github.com/zaphoyd/websocketpp/issues/794

--- src/cpp/ext/websocketpp/transport/asio/connection.hpp.orig	2019-03-05 23:41:04 UTC
+++ src/cpp/ext/websocketpp/transport/asio/connection.hpp
@@ -296,7 +296,7 @@ class connection : public config::socket_type::socket_
      */
     timer_ptr set_timer(long duration, timer_handler callback) {
         timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
-            lib::ref(*m_io_service),
+            *m_io_service,
             boost::posix_time::milliseconds(duration)
         );
 
@@ -423,7 +423,7 @@ class connection : public config::socket_type::socket_
 
         if (config::enable_multithreading) {
             m_strand = lib::make_shared<boost::asio::io_service::strand>(
-                lib::ref(*io_service));
+                *io_service);
 
             m_async_read_handler = m_strand->wrap(lib::bind(
                 &type::handle_async_read, get_shared(),lib::placeholders::_1,
--- src/cpp/ext/websocketpp/transport/asio/endpoint.hpp.orig	2019-03-05 23:41:04 UTC
+++ src/cpp/ext/websocketpp/transport/asio/endpoint.hpp
@@ -184,7 +184,7 @@ class endpoint : public config::socket_type { (public)
         m_io_service = ptr;
         m_external_io_service = true;
         m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
-            lib::ref(*m_io_service));
+            *m_io_service);
 
         m_state = READY;
         ec = lib::error_code();
@@ -610,7 +610,7 @@ class endpoint : public config::socket_type { (public)
      */
     void start_perpetual() {
         m_work = lib::make_shared<boost::asio::io_service::work>(
-            lib::ref(*m_io_service)
+            *m_io_service
         );
     }
 
@@ -776,7 +776,7 @@ class endpoint : public config::socket_type { (public)
         // Create a resolver
         if (!m_resolver) {
             m_resolver = lib::make_shared<boost::asio::ip::tcp::resolver>(
-                lib::ref(*m_io_service));
+                *m_io_service);
         }
 
         std::string proxy = tcon->get_proxy();
--- src/cpp/ext/websocketpp/transport/asio/security/none.hpp.orig	2019-03-05 23:41:04 UTC
+++ src/cpp/ext/websocketpp/transport/asio/security/none.hpp
@@ -167,7 +167,7 @@ class connection : public lib::enable_shared_from_this
         }
 
         m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
-            lib::ref(*service));
+            *service);
 
         m_state = READY;
 




https://github.com/zaphoyd/websocketpp/issues/794

--- libs/websocketpp/websocketpp/transport/asio/connection.hpp.orig	2016-10-28 19:20:12 UTC
+++ libs/websocketpp/websocketpp/transport/asio/connection.hpp
@@ -296,7 +296,7 @@ class connection : public config::socket_type::socket_
      */
     timer_ptr set_timer(long duration, timer_handler callback) {
         timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
-            lib::ref(*m_io_service),
+            *m_io_service,
             boost::posix_time::milliseconds(duration)
         );
 
@@ -423,7 +423,7 @@ class connection : public config::socket_type::socket_
 
         if (config::enable_multithreading) {
             m_strand = lib::make_shared<boost::asio::strand>(
-                lib::ref(*io_service));
+                *io_service);
 
             m_async_read_handler = m_strand->wrap(lib::bind(
                 &type::handle_async_read, get_shared(),lib::placeholders::_1,
--- libs/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig	2016-10-28 19:20:12 UTC
+++ libs/websocketpp/websocketpp/transport/asio/endpoint.hpp
@@ -184,7 +184,7 @@ class endpoint : public config::socket_type { (public)
         m_io_service = ptr;
         m_external_io_service = true;
         m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
-            lib::ref(*m_io_service));
+            *m_io_service);
 
         m_state = READY;
         ec = lib::error_code();
@@ -610,7 +610,7 @@ class endpoint : public config::socket_type { (public)
      */
     void start_perpetual() {
         m_work = lib::make_shared<boost::asio::io_service::work>(
-            lib::ref(*m_io_service)
+            *m_io_service
         );
     }
 
@@ -776,7 +776,7 @@ class endpoint : public config::socket_type { (public)
         // Create a resolver
         if (!m_resolver) {
             m_resolver = lib::make_shared<boost::asio::ip::tcp::resolver>(
-                lib::ref(*m_io_service));
+                *m_io_service);
         }
 
         std::string proxy = tcon->get_proxy();
--- libs/websocketpp/websocketpp/transport/asio/security/none.hpp.orig	2016-10-28 19:20:12 UTC
+++ libs/websocketpp/websocketpp/transport/asio/security/none.hpp
@@ -167,7 +167,7 @@ class connection : public lib::enable_shared_from_this
         }
 
         m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
-            lib::ref(*service));
+            *service);
 
         m_state = READY;
 

Lines 29-34 index 0be40f6b..395632c3 100644 Link Here

(-)b/devel/cpprestsdk/files/patch-git_6b2e048001 (-1 / +1 lines)
29	if (config::enable_multithreading) {	29	if (config::enable_multithreading) {
30	- m_strand = lib::make_shared<boost::asio::strand>(	30	- m_strand = lib::make_shared<boost::asio::strand>(
31	+ m_strand = lib::make_shared<boost::asio::io_service::strand>(	31	+ m_strand = lib::make_shared<boost::asio::io_service::strand>(
32	lib::ref(*io_service));	32	*io_service);
33		33
34	m_async_read_handler = m_strand->wrap(lib::bind(	34	m_async_read_handler = m_strand->wrap(lib::bind(

Lines 2-7 Link Here

(-)b/devel/websocketpp/Makefile (+1 lines)
2		2
3	PORTNAME= websocketpp	3	PORTNAME= websocketpp
4	PORTVERSION= 0.8.1	4	PORTVERSION= 0.8.1
		5	PORTREVISION= 1
5	CATEGORIES= devel	6	CATEGORIES= devel
6		7
7	MAINTAINER= arved@FreeBSD.org	8	MAINTAINER= arved@FreeBSD.org




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);




https://github.com/wesnoth/wesnoth/issues/3990

--- src/server/server_base.cpp.orig	2018-09-16 07:27:00 UTC
+++ src/server/server_base.cpp
@@ -65,7 +65,7 @@ void server_base::start_server()
 
 void server_base::serve()
 {
-	socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(std::ref(io_service_));
+	socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(io_service_);
 	acceptor_.async_accept(*socket, std::bind(&server_base::accept_connection, this, _1, socket));
 }
 




https://github.com/zaphoyd/websocketpp/issues/794

--- libs/websocketpp/websocketpp/transport/asio/connection.hpp.orig	2019-02-09 20:57:43 UTC
+++ libs/websocketpp/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,
--- libs/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig	2019-02-09 20:57:43 UTC
+++ libs/websocketpp/websocketpp/transport/asio/endpoint.hpp
@@ -192,7 +192,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();
@@ -661,7 +661,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
         );
     }
 
@@ -827,7 +827,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);
--- libs/websocketpp/websocketpp/transport/asio/security/none.hpp.orig	2019-02-09 20:57:43 UTC
+++ libs/websocketpp/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);
 
         m_state = READY;
 




--- src/plugins/server/3rdparty/include/websocketpp/transport/asio/connection.hpp.orig	2019-02-18 23:04:38 UTC
+++ src/plugins/server/3rdparty/include/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,
--- src/plugins/server/3rdparty/include/websocketpp/transport/asio/endpoint.hpp.orig	2019-02-18 23:04:38 UTC
+++ src/plugins/server/3rdparty/include/websocketpp/transport/asio/endpoint.hpp
@@ -192,7 +192,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();
@@ -661,7 +661,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
         );
     }
 
@@ -827,7 +827,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);
--- src/plugins/server/3rdparty/include/websocketpp/transport/asio/security/none.hpp.orig	2019-02-18 23:04:38 UTC
+++ src/plugins/server/3rdparty/include/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);
 
         m_state = READY;
 

Return to bug 236589

Added Link Here

(-)b/devel/RStudio/files/patch-boost-1.70 (+62 lines)
1	https://github.com/zaphoyd/websocketpp/issues/794
2
3	--- src/cpp/ext/websocketpp/transport/asio/connection.hpp.orig 2019-03-05 23:41:04 UTC
4	+++ src/cpp/ext/websocketpp/transport/asio/connection.hpp
5	@@ -296,7 +296,7 @@ class connection : public config::socket_type::socket_
6	*/
7	timer_ptr set_timer(long duration, timer_handler callback) {
8	timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
9	- lib::ref(*m_io_service),
10	+ *m_io_service,
11	boost::posix_time::milliseconds(duration)
12	);
13
14	@@ -423,7 +423,7 @@ class connection : public config::socket_type::socket_
15
16	if (config::enable_multithreading) {
17	m_strand = lib::make_shared<boost::asio::io_service::strand>(
18	- lib::ref(*io_service));
19	+ *io_service);
20
21	m_async_read_handler = m_strand->wrap(lib::bind(
22	&type::handle_async_read, get_shared(),lib::placeholders::_1,
23	--- src/cpp/ext/websocketpp/transport/asio/endpoint.hpp.orig 2019-03-05 23:41:04 UTC
24	+++ src/cpp/ext/websocketpp/transport/asio/endpoint.hpp
25	@@ -184,7 +184,7 @@ class endpoint : public config::socket_type { (public)
26	m_io_service = ptr;
27	m_external_io_service = true;
28	m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
29	- lib::ref(*m_io_service));
30	+ *m_io_service);
31
32	m_state = READY;
33	ec = lib::error_code();
34	@@ -610,7 +610,7 @@ class endpoint : public config::socket_type { (public)
35	*/
36	void start_perpetual() {
37	m_work = lib::make_shared<boost::asio::io_service::work>(
38	- lib::ref(*m_io_service)
39	+ *m_io_service
40	);
41	}
42
43	@@ -776,7 +776,7 @@ class endpoint : public config::socket_type { (public)
44	// Create a resolver
45	if (!m_resolver) {
46	m_resolver = lib::make_shared<boost::asio::ip::tcp::resolver>(
47	- lib::ref(*m_io_service));
48	+ *m_io_service);
49	}
50
51	std::string proxy = tcon->get_proxy();
52	--- src/cpp/ext/websocketpp/transport/asio/security/none.hpp.orig 2019-03-05 23:41:04 UTC
53	+++ src/cpp/ext/websocketpp/transport/asio/security/none.hpp
54	@@ -167,7 +167,7 @@ class connection : public lib::enable_shared_from_this
55	}
56
57	m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
58	- lib::ref(*service));
59	+ *service);
60
61	m_state = READY;
62

Added Link Here

(-)b/devel/cpprestsdk/files/patch-boost-1.70 (+62 lines)
1	https://github.com/zaphoyd/websocketpp/issues/794
2
3	--- libs/websocketpp/websocketpp/transport/asio/connection.hpp.orig 2016-10-28 19:20:12 UTC
4	+++ libs/websocketpp/websocketpp/transport/asio/connection.hpp
5	@@ -296,7 +296,7 @@ class connection : public config::socket_type::socket_
6	*/
7	timer_ptr set_timer(long duration, timer_handler callback) {
8	timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
9	- lib::ref(*m_io_service),
10	+ *m_io_service,
11	boost::posix_time::milliseconds(duration)
12	);
13
14	@@ -423,7 +423,7 @@ class connection : public config::socket_type::socket_
15
16	if (config::enable_multithreading) {
17	m_strand = lib::make_shared<boost::asio::strand>(
18	- lib::ref(*io_service));
19	+ *io_service);
20
21	m_async_read_handler = m_strand->wrap(lib::bind(
22	&type::handle_async_read, get_shared(),lib::placeholders::_1,
23	--- libs/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig 2016-10-28 19:20:12 UTC
24	+++ libs/websocketpp/websocketpp/transport/asio/endpoint.hpp
25	@@ -184,7 +184,7 @@ class endpoint : public config::socket_type { (public)
26	m_io_service = ptr;
27	m_external_io_service = true;
28	m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
29	- lib::ref(*m_io_service));
30	+ *m_io_service);
31
32	m_state = READY;
33	ec = lib::error_code();
34	@@ -610,7 +610,7 @@ class endpoint : public config::socket_type { (public)
35	*/
36	void start_perpetual() {
37	m_work = lib::make_shared<boost::asio::io_service::work>(
38	- lib::ref(*m_io_service)
39	+ *m_io_service
40	);
41	}
42
43	@@ -776,7 +776,7 @@ class endpoint : public config::socket_type { (public)
44	// Create a resolver
45	if (!m_resolver) {
46	m_resolver = lib::make_shared<boost::asio::ip::tcp::resolver>(
47	- lib::ref(*m_io_service));
48	+ *m_io_service);
49	}
50
51	std::string proxy = tcon->get_proxy();
52	--- libs/websocketpp/websocketpp/transport/asio/security/none.hpp.orig 2016-10-28 19:20:12 UTC
53	+++ libs/websocketpp/websocketpp/transport/asio/security/none.hpp
54	@@ -167,7 +167,7 @@ class connection : public lib::enable_shared_from_this
55	}
56
57	m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
58	- lib::ref(*service));
59	+ *service);
60
61	m_state = READY;
62

Added Link Here

(-)b/devel/websocketpp/files/patch-boost-1.70 (+62 lines)
1	https://github.com/zaphoyd/websocketpp/issues/794
2
3	--- websocketpp/transport/asio/connection.hpp.orig 2018-07-16 12:40:53 UTC
4	+++ websocketpp/transport/asio/connection.hpp
5	@@ -312,7 +312,7 @@ class connection : public config::socket_type::socket_
6	*/
7	timer_ptr set_timer(long duration, timer_handler callback) {
8	timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
9	- lib::ref(*m_io_service),
10	+ *m_io_service,
11	lib::asio::milliseconds(duration)
12	);
13
14	@@ -462,7 +462,7 @@ class connection : public config::socket_type::socket_
15
16	if (config::enable_multithreading) {
17	m_strand = lib::make_shared<lib::asio::io_service::strand>(
18	- lib::ref(*io_service));
19	+ *io_service);
20	}
21
22	lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
23	--- websocketpp/transport/asio/endpoint.hpp.orig 2018-07-16 12:40:53 UTC
24	+++ websocketpp/transport/asio/endpoint.hpp
25	@@ -196,7 +196,7 @@ class endpoint : public config::socket_type { (public)
26	m_io_service = ptr;
27	m_external_io_service = true;
28	m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
29	- lib::ref(*m_io_service));
30	+ *m_io_service);
31
32	m_state = READY;
33	ec = lib::error_code();
34	@@ -689,7 +689,7 @@ class endpoint : public config::socket_type { (public)
35	*/
36	void start_perpetual() {
37	m_work = lib::make_shared<lib::asio::io_service::work>(
38	- lib::ref(*m_io_service)
39	+ *m_io_service
40	);
41	}
42
43	@@ -855,7 +855,7 @@ class endpoint : public config::socket_type { (public)
44	// Create a resolver
45	if (!m_resolver) {
46	m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
47	- lib::ref(*m_io_service));
48	+ *m_io_service);
49	}
50
51	tcon->set_uri(u);
52	--- websocketpp/transport/asio/security/none.hpp.orig 2018-07-16 12:40:53 UTC
53	+++ websocketpp/transport/asio/security/none.hpp
54	@@ -169,7 +169,7 @@ class connection : public lib::enable_shared_from_this
55	}
56
57	m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
58	- lib::ref(*service));
59	+ *service);
60
61	if (m_socket_init_handler) {
62	m_socket_init_handler(m_hdl, *m_socket);

Added Link Here

(-)b/games/wesnoth/files/patch-boost-1.70 (+13 lines)
1	https://github.com/wesnoth/wesnoth/issues/3990
2
3	--- src/server/server_base.cpp.orig 2018-09-16 07:27:00 UTC
4	+++ src/server/server_base.cpp
5	@@ -65,7 +65,7 @@ void server_base::start_server()
6
7	void server_base::serve()
8	{
9	- socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(std::ref(io_service_));
10	+ socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(io_service_);
11	acceptor_.async_accept(*socket, std::bind(&server_base::accept_connection, this, _1, socket));
12	}
13

Added Link Here

(-)b/math/cadabra2/files/patch-boost-1.70 (+62 lines)
1	https://github.com/zaphoyd/websocketpp/issues/794
2
3	--- libs/websocketpp/websocketpp/transport/asio/connection.hpp.orig 2019-02-09 20:57:43 UTC
4	+++ libs/websocketpp/websocketpp/transport/asio/connection.hpp
5	@@ -312,7 +312,7 @@ class connection : public config::socket_type::socket_
6	*/
7	timer_ptr set_timer(long duration, timer_handler callback) {
8	timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
9	- lib::ref(*m_io_service),
10	+ *m_io_service,
11	lib::asio::milliseconds(duration)
12	);
13
14	@@ -462,7 +462,7 @@ class connection : public config::socket_type::socket_
15
16	if (config::enable_multithreading) {
17	m_strand = lib::make_shared<lib::asio::io_service::strand>(
18	- lib::ref(*io_service));
19	+ *io_service);
20	}
21
22	lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
23	--- libs/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig 2019-02-09 20:57:43 UTC
24	+++ libs/websocketpp/websocketpp/transport/asio/endpoint.hpp
25	@@ -192,7 +192,7 @@ class endpoint : public config::socket_type { (public)
26	m_io_service = ptr;
27	m_external_io_service = true;
28	m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
29	- lib::ref(*m_io_service));
30	+ *m_io_service);
31
32	m_state = READY;
33	ec = lib::error_code();
34	@@ -661,7 +661,7 @@ class endpoint : public config::socket_type { (public)
35	*/
36	void start_perpetual() {
37	m_work = lib::make_shared<lib::asio::io_service::work>(
38	- lib::ref(*m_io_service)
39	+ *m_io_service
40	);
41	}
42
43	@@ -827,7 +827,7 @@ class endpoint : public config::socket_type { (public)
44	// Create a resolver
45	if (!m_resolver) {
46	m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
47	- lib::ref(*m_io_service));
48	+ *m_io_service);
49	}
50
51	tcon->set_uri(u);
52	--- libs/websocketpp/websocketpp/transport/asio/security/none.hpp.orig 2019-02-09 20:57:43 UTC
53	+++ libs/websocketpp/websocketpp/transport/asio/security/none.hpp
54	@@ -169,7 +169,7 @@ class connection : public lib::enable_shared_from_this
55	}
56
57	m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
58	- lib::ref(*service));
59	+ *service);
60
61	m_state = READY;
62

Added Link Here

(-)b/multimedia/musikcube/files/patch-boost-1.70 (+60 lines)
1	--- src/plugins/server/3rdparty/include/websocketpp/transport/asio/connection.hpp.orig 2019-02-18 23:04:38 UTC
2	+++ src/plugins/server/3rdparty/include/websocketpp/transport/asio/connection.hpp
3	@@ -312,7 +312,7 @@ class connection : public config::socket_type::socket_
4	*/
5	timer_ptr set_timer(long duration, timer_handler callback) {
6	timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
7	- lib::ref(*m_io_service),
8	+ *m_io_service,
9	lib::asio::milliseconds(duration)
10	);
11
12	@@ -462,7 +462,7 @@ class connection : public config::socket_type::socket_
13
14	if (config::enable_multithreading) {
15	m_strand = lib::make_shared<lib::asio::io_service::strand>(
16	- lib::ref(*io_service));
17	+ *io_service);
18	}
19
20	lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
21	--- src/plugins/server/3rdparty/include/websocketpp/transport/asio/endpoint.hpp.orig 2019-02-18 23:04:38 UTC
22	+++ src/plugins/server/3rdparty/include/websocketpp/transport/asio/endpoint.hpp
23	@@ -192,7 +192,7 @@ class endpoint : public config::socket_type { (public)
24	m_io_service = ptr;
25	m_external_io_service = true;
26	m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
27	- lib::ref(*m_io_service));
28	+ *m_io_service);
29
30	m_state = READY;
31	ec = lib::error_code();
32	@@ -661,7 +661,7 @@ class endpoint : public config::socket_type { (public)
33	*/
34	void start_perpetual() {
35	m_work = lib::make_shared<lib::asio::io_service::work>(
36	- lib::ref(*m_io_service)
37	+ *m_io_service
38	);
39	}
40
41	@@ -827,7 +827,7 @@ class endpoint : public config::socket_type { (public)
42	// Create a resolver
43	if (!m_resolver) {
44	m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
45	- lib::ref(*m_io_service));
46	+ *m_io_service);
47	}
48
49	tcon->set_uri(u);
50	--- src/plugins/server/3rdparty/include/websocketpp/transport/asio/security/none.hpp.orig 2019-02-18 23:04:38 UTC
51	+++ src/plugins/server/3rdparty/include/websocketpp/transport/asio/security/none.hpp
52	@@ -169,7 +169,7 @@ class connection : public lib::enable_shared_from_this
53	}
54
55	m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
56	- lib::ref(*service));
57	+ *service);
58
59	m_state = READY;
60