diff options
Diffstat (limited to 'meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0002-Fix-missed-entries-fix-testing.patch')
-rw-r--r-- | meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0002-Fix-missed-entries-fix-testing.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0002-Fix-missed-entries-fix-testing.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0002-Fix-missed-entries-fix-testing.patch new file mode 100644 index 0000000000..962d089679 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0002-Fix-missed-entries-fix-testing.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | From 12ab603ca962e83591985a585451d33544d75d56 Mon Sep 17 00:00:00 2001 | ||
2 | From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> | ||
3 | Date: Wed, 17 Apr 2019 10:06:18 +0000 | ||
4 | Subject: [PATCH 2/2] Fix missed entries; fix testing | ||
5 | |||
6 | --- | ||
7 | CMakeLists.txt | 2 +- | ||
8 | websocketpp/transport/asio/connection.hpp | 3 +-- | ||
9 | websocketpp/transport/asio/endpoint.hpp | 7 ++----- | ||
10 | 3 files changed, 4 insertions(+), 8 deletions(-) | ||
11 | |||
12 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
13 | index 2786aba..951de97 100644 | ||
14 | --- a/CMakeLists.txt | ||
15 | +++ b/CMakeLists.txt | ||
16 | @@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) | ||
17 | endif () | ||
18 | |||
19 | if (NOT Boost_USE_STATIC_LIBS) | ||
20 | - add_definitions (/DBOOST_TEST_DYN_LINK) | ||
21 | + add_definitions (-DBOOST_TEST_DYN_LINK) | ||
22 | endif () | ||
23 | |||
24 | set (Boost_FIND_REQUIRED TRUE) | ||
25 | diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp | ||
26 | index 1ccda8f..57dda74 100644 | ||
27 | --- a/websocketpp/transport/asio/connection.hpp | ||
28 | +++ b/websocketpp/transport/asio/connection.hpp | ||
29 | @@ -462,8 +462,7 @@ protected: | ||
30 | m_io_service = io_service; | ||
31 | |||
32 | if (config::enable_multithreading) { | ||
33 | - m_strand = lib::make_shared<lib::asio::io_service::strand>( | ||
34 | - lib::ref(*io_service)); | ||
35 | + m_strand.reset(new lib::asio::io_service::strand(*io_service)); | ||
36 | } | ||
37 | |||
38 | lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, | ||
39 | diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp | ||
40 | index 4b719a9..94509ad 100644 | ||
41 | --- a/websocketpp/transport/asio/endpoint.hpp | ||
42 | +++ b/websocketpp/transport/asio/endpoint.hpp | ||
43 | @@ -687,9 +687,7 @@ public: | ||
44 | * @since 0.3.0 | ||
45 | */ | ||
46 | void start_perpetual() { | ||
47 | - m_work = lib::make_shared<lib::asio::io_service::work>( | ||
48 | - lib::ref(*m_io_service) | ||
49 | - ); | ||
50 | + m_work.reset(new lib::asio::io_service::work(*m_io_service)); | ||
51 | } | ||
52 | |||
53 | /// Clears the endpoint's perpetual flag, allowing it to exit when empty | ||
54 | @@ -853,8 +851,7 @@ protected: | ||
55 | |||
56 | // Create a resolver | ||
57 | if (!m_resolver) { | ||
58 | - m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>( | ||
59 | - lib::ref(*m_io_service)); | ||
60 | + m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); | ||
61 | } | ||
62 | |||
63 | tcon->set_uri(u); | ||
64 | -- | ||
65 | 2.23.0 | ||
66 | |||