diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-03-21 14:39:08 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-03-21 14:39:08 +0200 |
| commit | 190601e517d54172c4434edf98888a0dc6d1db8b (patch) | |
| tree | c6dfde6526b3745661a89dc3980cb46f8745450e /contrib/epee/src/connection_basic.cpp | |
| parent | f2f725d8db3535055d1c7e102c0bba75b22a3409 (diff) | |
| parent | 17769db9462e5201befcb05f86ccbaeabf35caf8 (diff) | |
| download | monzero-core-190601e517d54172c4434edf98888a0dc6d1db8b.tar.gz monzero-core-190601e517d54172c4434edf98888a0dc6d1db8b.tar.xz monzero-core-190601e517d54172c4434edf98888a0dc6d1db8b.zip | |
Merge pull request #5328
17769db9 epee: fix build with boost 1.70.0 (moneromooo-monero)
d6d6c46c cmake: handle detecting boost using boost's own cmake files (moneromooo-monero)
Diffstat (limited to 'contrib/epee/src/connection_basic.cpp')
| -rw-r--r-- | contrib/epee/src/connection_basic.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/contrib/epee/src/connection_basic.cpp b/contrib/epee/src/connection_basic.cpp index 83db171d8..6354082aa 100644 --- a/contrib/epee/src/connection_basic.cpp +++ b/contrib/epee/src/connection_basic.cpp @@ -47,6 +47,12 @@ // 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" @@ -117,8 +123,8 @@ connection_basic::connection_basic(boost::asio::ip::tcp::socket&& sock, boost::s : m_stats(std::move(stats)), mI( new connection_basic_pimpl("peer") ), - strand_(sock.get_io_service()), - socket_(sock.get_io_service(), ssl_context.context), + strand_(GET_IO_SERVICE(sock)), + socket_(GET_IO_SERVICE(sock), ssl_context.context), m_want_close_connection(false), m_was_shutdown(false), m_ssl_support(ssl_support), |