twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-09 06:18:02 +00:00
Code Issues Projects Releases Wiki Activity

Fix building with boost >= 1.70

Browse Source
This commit is contained in:
Chocobo1 2020-11-24 02:44:19 +08:00
parent 55ece85ce9
commit 1efa0961ae
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bitcoinrpc.cpp
View File

@ -645,7 +645,11 @@ public:
} }
bool connect(const std::string& server, const std::string& port) bool connect(const std::string& server, const std::string& port)
{ {
#if BOOST_VERSION >= 107000
ip::tcp::resolver resolver(static_cast<io_service&>(stream.get_executor().context()));
#else
ip::tcp::resolver resolver(stream.get_io_service()); ip::tcp::resolver resolver(stream.get_io_service());
#endif
ip::tcp::resolver::query query(server.c_str(), port.c_str()); ip::tcp::resolver::query query(server.c_str(), port.c_str());
ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve(query); ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
ip::tcp::resolver::iterator end; ip::tcp::resolver::iterator end;
@ -732,7 +736,11 @@ static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol> > accep
const bool fUseSSL) const bool fUseSSL)
{ {
// Accept connection // Accept connection
#if BOOST_VERSION >= 107000
AcceptedConnectionImpl<Protocol>* conn = new AcceptedConnectionImpl<Protocol>(static_cast<io_service&>(acceptor->get_executor().context()), context, fUseSSL);
#else
AcceptedConnectionImpl<Protocol>* conn = new AcceptedConnectionImpl<Protocol>(acceptor->get_io_service(), context, fUseSSL); AcceptedConnectionImpl<Protocol>* conn = new AcceptedConnectionImpl<Protocol>(acceptor->get_io_service(), context, fUseSSL);
#endif
acceptor->async_accept( acceptor->async_accept(
conn->sslStream.lowest_layer(), conn->sslStream.lowest_layer(),