aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/deps
diff options
context:
space:
mode:
authorMichael Dickens <michael.dickens@ettus.com>2018-01-22 14:30:37 -0500
committerMartin Braun <martin.braun@ettus.com>2018-01-22 15:34:28 -0800
commitc4080003f54c6fe1b5fd19edd23f8cd5f9a9f79a (patch)
tree9f23678e57ebc6123c5c2c873df57e31abeca71c /host/lib/deps
parent3b080f7ff547621ffe131f263034eac0ad8d2a40 (diff)
downloaduhd-c4080003f54c6fe1b5fd19edd23f8cd5f9a9f79a.tar.gz
uhd-c4080003f54c6fe1b5fd19edd23f8cd5f9a9f79a.tar.bz2
uhd-c4080003f54c6fe1b5fd19edd23f8cd5f9a9f79a.zip
rpclib: fix use of "boost::asio::strand" -> "boost::asio::io_service::strand"
The former was marked as deprecated numerous Boost versions ago and finally was actually removed & replaced in 1.66.0 with a new one with a template API. The version in rpclib need to be updated, and Boost docs say to use the latter. Moving to this usage takes care of this issue. Reviewed-by: Martin Braun <martin.braun@ettus.com>
Diffstat (limited to 'host/lib/deps')
-rw-r--r--host/lib/deps/rpclib/include/rpc/detail/async_writer.h2
-rw-r--r--host/lib/deps/rpclib/include/rpc/detail/server_session.h2
-rw-r--r--host/lib/deps/rpclib/lib/rpc/client.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/deps/rpclib/include/rpc/detail/async_writer.h b/host/lib/deps/rpclib/include/rpc/detail/async_writer.h
index 941bb1d8f..1e17f1292 100644
--- a/host/lib/deps/rpclib/include/rpc/detail/async_writer.h
+++ b/host/lib/deps/rpclib/include/rpc/detail/async_writer.h
@@ -69,7 +69,7 @@ public:
protected:
boost::asio::ip::tcp::socket socket_;
- boost::asio::strand write_strand_;
+ boost::asio::io_service::strand write_strand_;
std::atomic_bool exit_{false};
bool exited_ = false;
std::mutex m_exit_;
diff --git a/host/lib/deps/rpclib/include/rpc/detail/server_session.h b/host/lib/deps/rpclib/include/rpc/detail/server_session.h
index 963b082ec..754c0879c 100644
--- a/host/lib/deps/rpclib/include/rpc/detail/server_session.h
+++ b/host/lib/deps/rpclib/include/rpc/detail/server_session.h
@@ -35,7 +35,7 @@ private:
private:
server* parent_;
boost::asio::io_service *io_;
- boost::asio::strand read_strand_;
+ boost::asio::io_service::strand read_strand_;
std::shared_ptr<dispatcher> disp_;
RPCLIB_MSGPACK::unpacker pac_;
RPCLIB_MSGPACK::sbuffer output_buf_;
diff --git a/host/lib/deps/rpclib/lib/rpc/client.cc b/host/lib/deps/rpclib/lib/rpc/client.cc
index f4d649771..219bc3480 100644
--- a/host/lib/deps/rpclib/lib/rpc/client.cc
+++ b/host/lib/deps/rpclib/lib/rpc/client.cc
@@ -133,7 +133,7 @@ struct client::impl {
client *parent_;
boost::asio::io_service io_;
- boost::asio::strand strand_;
+ boost::asio::io_service::strand strand_;
std::atomic<int> call_idx_; /// The index of the last call made
std::unordered_map<uint32_t, call_t> ongoing_calls_;
std::string addr_;