hero123457/uhd
1
0
Fork 0
mirror of https://github.com/EttusResearch/uhd.git synced 2026-10-25 17:36:10 +00:00
Code Issues Projects Releases Wiki Activity

rpclib: fix use of "boost::asio::strand" -> "boost::asio::io_service::strand"

Browse Source 
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>
This commit is contained in:
Michael Dickens 2018-01-22 14:30:37 -05:00 committed by Martin Braun
parent 3b080f7ff5
commit c4080003f5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
host/lib/deps/rpclib/include/rpc/detail/async_writer.h
View File

@ -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_;

2
host/lib/deps/rpclib/include/rpc/detail/server_session.h
View File

@ -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_;

2
host/lib/deps/rpclib/lib/rpc/client.cc
View File

@ -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_;