diff options
author | Riccardo Spagni <ric@spagni.net> | 2019-03-27 14:09:11 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2019-03-27 14:09:11 +0200 |
commit | 1d83ce8f298850f4c16a110b87245377166cb17c (patch) | |
tree | 5d1903ab4b132c137b1bb838037f024d6fb8b0d3 /contrib/epee/include/net/abstract_tcp_server2.inl | |
parent | Merge pull request #5286 (diff) | |
parent | Added socks proxy (tor/i2pd/kovri) support to wallet (diff) | |
download | monero-1d83ce8f298850f4c16a110b87245377166cb17c.tar.xz |
Merge pull request #5090
7acfa9f3 Added socks proxy (tor/i2pd/kovri) support to wallet (Lee Clagett)
Diffstat (limited to 'contrib/epee/include/net/abstract_tcp_server2.inl')
-rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.inl | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl index e4b504466..67c63cca5 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.inl +++ b/contrib/epee/include/net/abstract_tcp_server2.inl @@ -58,11 +58,6 @@ #define DEFAULT_TIMEOUT_MS_REMOTE 300000 // 5 minutes #define TIMEOUT_EXTRA_MS_PER_BYTE 0.2 -#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 PRAGMA_WARNING_PUSH namespace epee |