View | Details | Raw Unified | Return to bug 224123 | Differences between
and this patch

Collapse All | Expand All

(-)files/patch-src_third__party_websocketpp_websocketpp_transport_asio_connection.hpp (+21 lines)
Line 0 Link Here
1
--- src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp.orig	2014-01-10 21:18:21 UTC
2
+++ src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp
3
@@ -79,10 +79,18 @@ class connection : public config::socket_type::socket_
4
     typedef typename config::response_type response_type;
5
     typedef typename response_type::ptr response_ptr;
6
 
7
+#if BOOST_VERSION < 106600
8
     /// Type of a pointer to the ASIO io_service being used
9
     typedef boost::asio::io_service* io_service_ptr;
10
     /// Type of a pointer to the ASIO io_service::strand being used
11
     typedef lib::shared_ptr<boost::asio::io_service::strand> strand_ptr;
12
+#else
13
+    /// Type of a pointer to the ASIO io_service being used
14
+    typedef boost::asio::io_context* io_service_ptr;
15
+    /// Type of a pointer to the ASIO io_service::strand being used
16
+    typedef lib::shared_ptr<boost::asio::io_context::strand> strand_ptr;
17
+#endif
18
+    
19
     /// Type of a pointer to the ASIO timer class
20
     typedef lib::shared_ptr<boost::asio::deadline_timer> timer_ptr;
21
 
(-)files/patch-src_third__party_websocketpp_websocketpp_transport_asio_endpoint.hpp (+28 lines)
Line 0 Link Here
1
--- src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig	2014-01-10 21:18:21 UTC
2
+++ src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp
3
@@ -76,16 +76,23 @@ class endpoint : public config::socket_type { (public)
4
     /// associated with this endpoint transport component
5
     typedef typename transport_con_type::ptr transport_con_ptr;
6
 
7
+#if BOOST_VERSION < 106600
8
     /// Type of a pointer to the ASIO io_service being used
9
     typedef boost::asio::io_service* io_service_ptr;
10
+    /// Type of a shared pointer to an io_service work object
11
+    typedef lib::shared_ptr<boost::asio::io_service::work> work_ptr;
12
+#else
13
+    /// Type of a pointer to the ASIO io_service being used
14
+    typedef boost::asio::io_context* io_service_ptr;
15
+    /// Type of a shared pointer to an io_service work object
16
+    typedef lib::shared_ptr<boost::asio::io_context::work> work_ptr;
17
+#endif
18
     /// Type of a shared pointer to the acceptor being used
19
     typedef lib::shared_ptr<boost::asio::ip::tcp::acceptor> acceptor_ptr;
20
     /// Type of a shared pointer to the resolver being used
21
     typedef lib::shared_ptr<boost::asio::ip::tcp::resolver> resolver_ptr;
22
     /// Type of timer handle
23
     typedef lib::shared_ptr<boost::asio::deadline_timer> timer_ptr;
24
-    /// Type of a shared pointer to an io_service work object
25
-    typedef lib::shared_ptr<boost::asio::io_service::work> work_ptr;
26
 
27
     // generate and manage our own io_service
28
     explicit endpoint()

Return to bug 224123