]>
Commit | Line | Data |
---|---|---|
8c4aad5f JB |
1 | --- libtorrent-rasterbar-1.1.11/include/libtorrent/io_service_fwd.hpp.orig 2018-11-18 13:55:50.000000000 +0100 |
2 | +++ libtorrent-rasterbar-1.1.11/include/libtorrent/io_service_fwd.hpp 2019-04-28 16:31:24.497229017 +0200 | |
3 | @@ -69,6 +69,15 @@ | |
4 | #else | |
b47425e4 | 5 | typedef boost::asio::io_service io_service; |
b47425e4 JB |
6 | #endif |
7 | + | |
8 | +#if BOOST_VERSION >= 107000 | |
9 | +template <typename T> | |
10 | +io_service& get_io_service(T& o) { return static_cast<io_service&>(o.get_executor().context()); } | |
11 | +#else | |
12 | +template <typename T> | |
13 | +io_service& get_io_service(T& o) { return o.get_io_service(); } | |
14 | +#endif | |
15 | + | |
16 | } | |
17 | ||
18 | #endif | |
8c4aad5f JB |
19 | --- libtorrent-rasterbar-1.1.11/include/libtorrent/io_service.hpp.orig 2019-04-28 16:35:33.779211874 +0200 |
20 | +++ libtorrent-rasterbar-1.1.11/include/libtorrent/io_service.hpp 2019-04-28 16:35:38.492519673 +0200 | |
21 | @@ -58,14 +58,7 @@ | |
b47425e4 JB |
22 | #undef Protocol |
23 | #endif | |
24 | ||
25 | -namespace libtorrent | |
26 | -{ | |
8c4aad5f JB |
27 | -#if defined TORRENT_BUILD_SIMULATOR |
28 | - typedef sim::asio::io_service io_service; | |
b47425e4 JB |
29 | -#else |
30 | - typedef boost::asio::io_service io_service; | |
31 | -#endif | |
32 | -} | |
33 | +#include "libtorrent/io_service_fwd.hpp" | |
34 | ||
35 | #endif | |
36 | ||
37 | --- libtorrent-rasterbar-1.0.11/include/libtorrent/tracker_manager.hpp.orig 2017-02-04 19:16:33.000000000 +0100 | |
38 | +++ libtorrent-rasterbar-1.0.11/include/libtorrent/tracker_manager.hpp 2019-04-27 18:54:42.557868860 +0200 | |
39 | @@ -191,7 +191,7 @@ | |
40 | virtual void on_timeout(error_code const& ec) = 0; | |
41 | virtual ~timeout_handler() {} | |
42 | ||
43 | - io_service& get_io_service() { return m_timeout.get_io_service(); } | |
44 | + io_service& get_io_service() { return libtorrent::get_io_service(m_timeout); } | |
45 | ||
46 | private: | |
47 | ||
8c4aad5f JB |
48 | --- libtorrent-rasterbar-1.1.11/include/libtorrent/proxy_base.hpp.orig 2017-02-04 19:16:33.000000000 +0100 |
49 | +++ libtorrent-rasterbar-1.1.11/include/libtorrent/proxy_base.hpp 2019-04-27 21:18:33.689487409 +0200 | |
50 | @@ -250,7 +250,7 @@ | |
b47425e4 JB |
51 | |
52 | io_service& get_io_service() | |
53 | { | |
54 | - return m_sock.get_io_service(); | |
55 | + return libtorrent::get_io_service(m_sock); | |
56 | } | |
57 | ||
58 | lowest_layer_type& lowest_layer() | |
8c4aad5f JB |
59 | --- libtorrent-rasterbar-1.1.11/include/libtorrent/udp_socket.hpp.orig 2019-04-28 17:14:01.486709949 +0200 |
60 | +++ libtorrent-rasterbar-1.1.11/include/libtorrent/udp_socket.hpp 2019-04-28 17:34:30.006721152 +0200 | |
b47425e4 | 61 | @@ -80,7 +80,7 @@ |
8c4aad5f JB |
62 | }; |
63 | ||
64 | bool is_open() const { return m_abort == false; } | |
b47425e4 JB |
65 | - io_service& get_io_service() { return m_ipv4_sock.get_io_service(); } |
66 | + io_service& get_io_service() { return libtorrent::get_io_service(m_ipv4_sock); } | |
67 | ||
68 | void subscribe(udp_socket_observer* o); | |
69 | void unsubscribe(udp_socket_observer* o); | |
8c4aad5f JB |
70 | --- libtorrent-rasterbar-1.1.11/src/http_connection.cpp.orig 2019-04-28 17:34:49.723281005 +0200 |
71 | +++ libtorrent-rasterbar-1.1.11/src/http_connection.cpp 2019-04-28 19:21:25.738630816 +0200 | |
72 | @@ -150,7 +150,7 @@ | |
b47425e4 | 73 | |
8c4aad5f | 74 | if (ec) |
b47425e4 | 75 | { |
8c4aad5f JB |
76 | - m_timer.get_io_service().post(boost::bind(&http_connection::callback |
77 | + libtorrent::get_io_service(m_timer).post(boost::bind(&http_connection::callback | |
78 | , me, ec, static_cast<char*>(NULL), 0)); | |
b47425e4 JB |
79 | return; |
80 | } | |
8c4aad5f JB |
81 | @@ -162,7 +162,7 @@ |
82 | ) | |
b47425e4 | 83 | { |
8c4aad5f JB |
84 | error_code err(errors::unsupported_url_protocol); |
85 | - m_timer.get_io_service().post(boost::bind(&http_connection::callback | |
86 | + libtorrent::get_io_service(m_timer).post(boost::bind(&http_connection::callback | |
87 | , me, err, static_cast<char*>(NULL), 0)); | |
b47425e4 JB |
88 | return; |
89 | } | |
8c4aad5f | 90 | @@ -263,7 +263,7 @@ |
b47425e4 JB |
91 | |
92 | if (ec) | |
93 | { | |
8c4aad5f JB |
94 | - m_timer.get_io_service().post(boost::bind(&http_connection::callback |
95 | + libtorrent::get_io_service(m_timer).post(boost::bind(&http_connection::callback | |
96 | , me, ec, static_cast<char*>(NULL), 0)); | |
b47425e4 JB |
97 | return; |
98 | } | |
8c4aad5f | 99 | @@ -303,7 +303,7 @@ |
b47425e4 | 100 | |
8c4aad5f JB |
101 | if (i2p_conn->proxy().type != settings_pack::i2p_proxy) |
102 | { | |
103 | - m_timer.get_io_service().post(boost::bind(&http_connection::callback | |
104 | + libtorrent::get_io_service(m_timer).post(boost::bind(&http_connection::callback | |
105 | , me, error_code(errors::no_i2p_router), static_cast<char*>(NULL), 0)); | |
106 | return; | |
107 | } | |
108 | @@ -337,7 +337,7 @@ | |
109 | m_ssl_ctx->set_verify_mode(ssl::context::verify_none, ec); | |
110 | if (ec) | |
111 | { | |
112 | - m_timer.get_io_service().post(boost::bind(&http_connection::callback | |
113 | + libtorrent::get_io_service(m_timer).post(boost::bind(&http_connection::callback | |
114 | , me, ec, static_cast<char*>(NULL), 0)); | |
115 | return; | |
116 | } | |
117 | @@ -349,7 +349,7 @@ | |
118 | // assume this is not a tracker connection. Tracker connections that | |
119 | // shouldn't be subject to the proxy should pass in NULL as the proxy | |
120 | // pointer. | |
121 | - instantiate_connection(m_timer.get_io_service() | |
122 | + instantiate_connection(libtorrent::get_io_service(m_timer) | |
123 | , proxy ? *proxy : null_proxy, m_sock, userdata, NULL, false, false); | |
124 | ||
125 | if (m_bind_addr) | |
126 | @@ -358,7 +358,7 @@ | |
127 | m_sock.bind(tcp::endpoint(*m_bind_addr, 0), ec); | |
b47425e4 JB |
128 | if (ec) |
129 | { | |
8c4aad5f JB |
130 | - m_timer.get_io_service().post(boost::bind(&http_connection::callback |
131 | + libtorrent::get_io_service(m_timer).post(boost::bind(&http_connection::callback | |
132 | , me, ec, static_cast<char*>(NULL), 0)); | |
b47425e4 JB |
133 | return; |
134 | } | |
8c4aad5f | 135 | @@ -367,7 +367,7 @@ |
b47425e4 JB |
136 | setup_ssl_hostname(m_sock, hostname, ec); |
137 | if (ec) | |
138 | { | |
8c4aad5f JB |
139 | - m_timer.get_io_service().post(boost::bind(&http_connection::callback |
140 | + libtorrent::get_io_service(m_timer).post(boost::bind(&http_connection::callback | |
141 | , me, ec, static_cast<char*>(NULL), 0)); | |
b47425e4 JB |
142 | return; |
143 | } | |
144 | --- libtorrent-rasterbar-1.0.11/src/natpmp.cpp.orig 2017-02-04 19:16:33.000000000 +0100 | |
145 | +++ libtorrent-rasterbar-1.0.11/src/natpmp.cpp 2019-04-27 20:27:53.220415927 +0200 | |
146 | @@ -88,7 +88,7 @@ | |
147 | mutex::scoped_lock l(m_mutex); | |
148 | ||
149 | error_code ec; | |
150 | - address gateway = get_default_gateway(m_socket.get_io_service(), ec); | |
151 | + address gateway = get_default_gateway(libtorrent::get_io_service(m_socket), ec); | |
152 | if (ec) | |
153 | { | |
154 | char msg[200]; | |
8c4aad5f JB |
155 | --- libtorrent-rasterbar-1.1.11/src/lsd.cpp.orig 2018-11-18 13:55:50.000000000 +0100 |
156 | +++ libtorrent-rasterbar-1.1.11/src/lsd.cpp 2019-04-28 19:35:37.014019062 +0200 | |
157 | @@ -112,12 +112,12 @@ | |
158 | void lsd::start(error_code& ec) | |
159 | { | |
160 | m_socket.open(boost::bind(&lsd::on_announce, self(), _1, _2, _3) | |
161 | - , m_broadcast_timer.get_io_service(), ec); | |
162 | + , libtorrent::get_io_service(m_broadcast_timer), ec); | |
163 | if (ec) return; | |
164 | ||
165 | #if TORRENT_USE_IPV6 | |
166 | m_socket6.open(boost::bind(&lsd::on_announce, self(), _1, _2, _3) | |
167 | - , m_broadcast_timer.get_io_service(), ec); | |
168 | + , libtorrent::get_io_service(m_broadcast_timer), ec); | |
b47425e4 | 169 | #endif |
8c4aad5f | 170 | } |
b47425e4 | 171 | |
8c4aad5f JB |
172 | --- libtorrent-rasterbar-1.1.11/src/upnp.cpp.orig 2018-11-18 13:55:54.000000000 +0100 |
173 | +++ libtorrent-rasterbar-1.1.11/src/upnp.cpp 2019-04-28 20:23:06.875246705 +0200 | |
174 | @@ -135,7 +135,7 @@ | |
b47425e4 | 175 | { |
8c4aad5f JB |
176 | error_code ec; |
177 | m_socket.open(boost::bind(&upnp::on_reply, self(), _1, _2, _3) | |
178 | - , m_refresh_timer.get_io_service(), ec); | |
179 | + , libtorrent::get_io_service(m_refresh_timer), ec); | |
b47425e4 | 180 | |
8c4aad5f JB |
181 | m_mappings.reserve(10); |
182 | } |