diff options
| author | tobtoht <tob@featherwallet.org> | 2025-02-15 04:48:18 +0000 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2025-02-15 04:48:18 +0000 |
| commit | be0efaf7f6a97d437381b7988f6dfcedb89cb4af (patch) | |
| tree | 7aa82581901a978c3c7ba3b0f50ac8c84f753945 /contrib/epee/src/connection_basic.cpp | |
| parent | 23a11d851adef30aea1888da0a7dd23936c81ec1 (diff) | |
| parent | 01bcd52924244ec8d2a24c10fcef8959289d09ff (diff) | |
| download | monzero-core-be0efaf7f6a97d437381b7988f6dfcedb89cb4af.tar.gz monzero-core-be0efaf7f6a97d437381b7988f6dfcedb89cb4af.tar.xz monzero-core-be0efaf7f6a97d437381b7988f6dfcedb89cb4af.zip | |
Merge pull request #9800
01bcd5292 Fix build with boost ASIO 0.87. Support boost 1.66+ (Lee *!* Clagett)
Diffstat (limited to 'contrib/epee/src/connection_basic.cpp')
| -rw-r--r-- | contrib/epee/src/connection_basic.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/contrib/epee/src/connection_basic.cpp b/contrib/epee/src/connection_basic.cpp index b0a30f47f..1fdd82c1b 100644 --- a/contrib/epee/src/connection_basic.cpp +++ b/contrib/epee/src/connection_basic.cpp @@ -46,12 +46,6 @@ // TODO: #include "net/network_throttle-detail.hpp" -#if BOOST_VERSION >= 107000 -#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) -#else -#define GET_IO_SERVICE(s) ((s).get_io_service()) -#endif - #undef MONERO_DEFAULT_LOG_CATEGORY #define MONERO_DEFAULT_LOG_CATEGORY "net.conn" @@ -127,12 +121,12 @@ connection_basic_pimpl::connection_basic_pimpl(const std::string &name) : m_thro int connection_basic_pimpl::m_default_tos; // methods: -connection_basic::connection_basic(boost::asio::ip::tcp::socket&& sock, std::shared_ptr<connection_basic_shared_state> state, ssl_support_t ssl_support) +connection_basic::connection_basic(boost::asio::io_context &io_context, boost::asio::ip::tcp::socket&& sock, std::shared_ptr<connection_basic_shared_state> state, ssl_support_t ssl_support) : m_state(std::move(state)), mI( new connection_basic_pimpl("peer") ), - strand_(GET_IO_SERVICE(sock)), - socket_(GET_IO_SERVICE(sock), get_context(m_state.get())), + strand_(io_context), + socket_(io_context, get_context(m_state.get())), m_want_close_connection(false), m_was_shutdown(false), m_is_multithreaded(false), @@ -152,12 +146,12 @@ connection_basic::connection_basic(boost::asio::ip::tcp::socket&& sock, std::sha _note("Spawned connection #"<<mI->m_peer_number<<" to " << remote_addr_str << " currently we have sockets count:" << m_state->sock_count); } -connection_basic::connection_basic(boost::asio::io_service &io_service, std::shared_ptr<connection_basic_shared_state> state, ssl_support_t ssl_support) +connection_basic::connection_basic(boost::asio::io_context &io_context, std::shared_ptr<connection_basic_shared_state> state, ssl_support_t ssl_support) : m_state(std::move(state)), mI( new connection_basic_pimpl("peer") ), - strand_(io_service), - socket_(io_service, get_context(m_state.get())), + strand_(io_context), + socket_(io_context, get_context(m_state.get())), m_want_close_connection(false), m_was_shutdown(false), m_is_multithreaded(false), |