Attachment 188819 Details for Bug 224123 – Proposed fix

[patch] Proposed fix

pth.diff (text/plain), 4.05 KB, created by Guido Falsi on 2017-12-14 09:29:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2017-12-14 09:29:38 UTC

Size: 4.05 KB

patch

obsolete

>Index: files/patch-src_third__party_websocketpp_websocketpp_transport_asio_connection.hpp
>===================================================================
>--- files/patch-src_third__party_websocketpp_websocketpp_transport_asio_connection.hpp	(nonexistent)
>+++ files/patch-src_third__party_websocketpp_websocketpp_transport_asio_connection.hpp	(working copy)
>@@ -0,0 +1,21 @@
>+--- src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp.orig	2014-01-10 21:18:21 UTC
>++++ src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp
>+@@ -79,10 +79,18 @@ class connection : public config::socket_type::socket_
>+     typedef typename config::response_type response_type;
>+     typedef typename response_type::ptr response_ptr;
>+ 
>++#if BOOST_VERSION < 106600
>+     /// Type of a pointer to the ASIO io_service being used
>+     typedef boost::asio::io_service* io_service_ptr;
>+     /// Type of a pointer to the ASIO io_service::strand being used
>+     typedef lib::shared_ptr<boost::asio::io_service::strand> strand_ptr;
>++#else
>++    /// Type of a pointer to the ASIO io_service being used
>++    typedef boost::asio::io_context* io_service_ptr;
>++    /// Type of a pointer to the ASIO io_service::strand being used
>++    typedef lib::shared_ptr<boost::asio::io_context::strand> strand_ptr;
>++#endif
>++    
>+     /// Type of a pointer to the ASIO timer class
>+     typedef lib::shared_ptr<boost::asio::deadline_timer> timer_ptr;
>+ 
>
>Property changes on: files/patch-src_third__party_websocketpp_websocketpp_transport_asio_connection.hpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_third__party_websocketpp_websocketpp_transport_asio_endpoint.hpp
>===================================================================
>--- files/patch-src_third__party_websocketpp_websocketpp_transport_asio_endpoint.hpp	(nonexistent)
>+++ files/patch-src_third__party_websocketpp_websocketpp_transport_asio_endpoint.hpp	(working copy)
>@@ -0,0 +1,28 @@
>+--- src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig	2014-01-10 21:18:21 UTC
>++++ src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp
>+@@ -76,16 +76,23 @@ class endpoint : public config::socket_type { (public)
>+     /// associated with this endpoint transport component
>+     typedef typename transport_con_type::ptr transport_con_ptr;
>+ 
>++#if BOOST_VERSION < 106600
>+     /// Type of a pointer to the ASIO io_service being used
>+     typedef boost::asio::io_service* io_service_ptr;
>++    /// Type of a shared pointer to an io_service work object
>++    typedef lib::shared_ptr<boost::asio::io_service::work> work_ptr;
>++#else
>++    /// Type of a pointer to the ASIO io_service being used
>++    typedef boost::asio::io_context* io_service_ptr;
>++    /// Type of a shared pointer to an io_service work object
>++    typedef lib::shared_ptr<boost::asio::io_context::work> work_ptr;
>++#endif
>+     /// Type of a shared pointer to the acceptor being used
>+     typedef lib::shared_ptr<boost::asio::ip::tcp::acceptor> acceptor_ptr;
>+     /// Type of a shared pointer to the resolver being used
>+     typedef lib::shared_ptr<boost::asio::ip::tcp::resolver> resolver_ptr;
>+     /// Type of timer handle
>+     typedef lib::shared_ptr<boost::asio::deadline_timer> timer_ptr;
>+-    /// Type of a shared pointer to an io_service work object
>+-    typedef lib::shared_ptr<boost::asio::io_service::work> work_ptr;
>+ 
>+     // generate and manage our own io_service
>+     explicit endpoint()
>
>Property changes on: files/patch-src_third__party_websocketpp_websocketpp_transport_asio_endpoint.hpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 224123: 188819 | 189215