blob: 1ec458bb8698a8bde04a35d6bd09fd1dd4959731 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-03-28 16:08:20.000000000 +1100
+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-08-20 22:38:53.808923305 +1000
@@ -296,7 +296,11 @@
*/
timer_ptr set_timer(long duration, timer_handler callback) {
timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
+ *m_io_service,
+#else
lib::ref(*m_io_service),
+#endif
boost::posix_time::milliseconds(duration)
);
--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-03-28 16:08:20.000000000 +1100
+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-08-20 22:38:53.822923358 +1000
@@ -184,7 +184,12 @@
m_io_service = ptr;
m_external_io_service = true;
m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
- lib::ref(*m_io_service));
+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
+ *m_io_service
+#else
+ lib::ref(*m_io_service)
+#endif
+ );
m_state = READY;
ec = lib::error_code();
--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-03-28 16:08:20.000000000 +1100
+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-08-20 22:38:53.823923362 +1000
@@ -167,7 +167,12 @@
}
m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
- lib::ref(*service));
+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
+ *service
+#else
+ lib::ref(*service)
+#endif
+ );
m_state = READY;
|
