blob: eed2c5c955cb53959015286e30dd056936826b1a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
|
--- rstudio-1.2.1335-orig/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-03-28 16:08:20.000000000 +1100
+++ rstudio-1.2.1335/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-04-09 22:08:45.331273559 +1000
@@ -77,7 +77,13 @@
{
// start a timer that will cancel any outstanding asynchronous operations
// when it elapses if the connection operation has not succeeded
- pConnectionTimer_.reset(new boost::asio::deadline_timer(resolver_.get_io_service(), timeout));
+ pConnectionTimer_.reset(new boost::asio::deadline_timer(
+#if BOOST_VERSION >= 107000
+ resolver_.get_executor(),
+#else
+ resolver_.get_io_service(),
+#endif
+ timeout));
pConnectionTimer_->async_wait(boost::bind(&TcpIpAsyncConnector::onConnectionTimeout,
TcpIpAsyncConnector::shared_from_this(),
boost::asio::placeholders::error));
|