File eccoin-boost.patch of Package eccoin
--- src/rpc/rpcserver.cpp 2020-03-20 19:34:52.000000000 +0100
+++ rpcserver.cpp 2021-08-07 19:28:16.457199071 +0200
@@ -64,7 +64,7 @@
void RPCServer::OnStopped(boost::function<void()> slot) { g_rpcSignals.Stopped.connect(slot); }
void RPCServer::OnPreCommand(boost::function<void(const CRPCCommand &)> slot)
{
- g_rpcSignals.PreCommand.connect(boost::bind(slot, _1));
+ g_rpcSignals.PreCommand.connect(boost::bind(slot, std::placeholders::_1));
}
void RPCTypeCheck(const UniValue ¶ms, const std::list<UniValue::VType> &typesExpected, bool fAllowNull)
--- src/torcontrol.cpp 2020-03-20 19:34:52.000000000 +0100
+++ torcontrol.cpp 2021-08-07 19:28:16.461199071 +0200
@@ -423,8 +423,8 @@
reconnect_timeout(RECONNECT_TIMEOUT_START)
{
// Start connection attempts immediately
- if (!conn.Connect(_target, boost::bind(&TorController::connected_cb, this, _1),
- boost::bind(&TorController::disconnected_cb, this, _1)))
+ if (!conn.Connect(_target, boost::bind(&TorController::connected_cb, this, std::placeholders::_1),
+ boost::bind(&TorController::disconnected_cb, this, std::placeholders::_1)))
{
LogPrintf("tor: Initiating connection to Tor control port %s failed\n", target);
}
@@ -507,7 +507,7 @@
// Note that the 'virtual' port doesn't have to be the same as our internal port, but this is just a convenient
// choice. TODO; refactor the shutdown sequence some day.
_conn.Command(strprintf("ADD_ONION %s Port=%i,127.0.0.1:%i", private_key, GetListenPort(), GetListenPort()),
- boost::bind(&TorController::add_onion_cb, this, _1, _2));
+ boost::bind(&TorController::add_onion_cb, this, std::placeholders::_1, std::placeholders::_2));
}
else
{
@@ -576,7 +576,7 @@
std::vector<uint8_t> computedClientHash =
ComputeResponse(TOR_SAFE_CLIENTKEY, cookie, clientNonce, serverNonce);
_conn.Command(
- "AUTHENTICATE " + HexStr(computedClientHash), boost::bind(&TorController::auth_cb, this, _1, _2));
+ "AUTHENTICATE " + HexStr(computedClientHash), boost::bind(&TorController::auth_cb, this, std::placeholders::_1, std::placeholders::_2));
}
else
{
@@ -637,7 +637,7 @@
if (methods.count("NULL"))
{
LogPrint("tor", "tor: Using NULL authentication\n");
- _conn.Command("AUTHENTICATE", boost::bind(&TorController::auth_cb, this, _1, _2));
+ _conn.Command("AUTHENTICATE", boost::bind(&TorController::auth_cb, this, std::placeholders::_1, std::placeholders::_2));
}
else if (methods.count("SAFECOOKIE"))
{
@@ -648,12 +648,12 @@
if (status_cookie.first && status_cookie.second.size() == TOR_COOKIE_SIZE)
{
// _conn.Command("AUTHENTICATE " + HexStr(status_cookie.second), boost::bind(&TorController::auth_cb,
- // this, _1, _2));
+ // this, std::placeholders::_1, std::placeholders::_2));
cookie = std::vector<uint8_t>(status_cookie.second.begin(), status_cookie.second.end());
clientNonce = std::vector<uint8_t>(TOR_NONCE_SIZE, 0);
GetRandBytes(&clientNonce[0], TOR_NONCE_SIZE);
_conn.Command("AUTHCHALLENGE SAFECOOKIE " + HexStr(clientNonce),
- boost::bind(&TorController::authchallenge_cb, this, _1, _2));
+ boost::bind(&TorController::authchallenge_cb, this, std::placeholders::_1, std::placeholders::_2));
}
else
{
@@ -675,7 +675,7 @@
LogPrint("tor", "tor: Using HASHEDPASSWORD authentication\n");
boost::replace_all(torpassword, "\"", "\\\"");
_conn.Command(
- "AUTHENTICATE \"" + torpassword + "\"", boost::bind(&TorController::auth_cb, this, _1, _2));
+ "AUTHENTICATE \"" + torpassword + "\"", boost::bind(&TorController::auth_cb, this, std::placeholders::_1, std::placeholders::_2));
}
else
{
@@ -697,7 +697,7 @@
{
reconnect_timeout = RECONNECT_TIMEOUT_START;
// First send a PROTOCOLINFO command to figure out what authentication is expected
- if (!_conn.Command("PROTOCOLINFO 1", boost::bind(&TorController::protocolinfo_cb, this, _1, _2)))
+ if (!_conn.Command("PROTOCOLINFO 1", boost::bind(&TorController::protocolinfo_cb, this, std::placeholders::_1, std::placeholders::_2)))
LogPrintf("tor: Error sending initial protocolinfo command\n");
}
@@ -724,8 +724,8 @@
/* Try to reconnect and reestablish if we get booted - for example, Tor
* may be restarting.
*/
- if (!conn.Connect(target, boost::bind(&TorController::connected_cb, this, _1),
- boost::bind(&TorController::disconnected_cb, this, _1)))
+ if (!conn.Connect(target, boost::bind(&TorController::connected_cb, this, std::placeholders::_1),
+ boost::bind(&TorController::disconnected_cb, this, std::placeholders::_1)))
{
LogPrintf("tor: Re-initiating connection to Tor control port %s failed\n", target);
}
--- src/validationinterface.cpp 2020-03-20 19:34:52.000000000 +0100
+++ validationinterface.cpp 2021-08-07 19:28:16.461199071 +0200
@@ -12,30 +12,30 @@
CMainSignals &GetMainSignals() { return g_signals; }
void RegisterValidationInterface(CValidationInterface *pwalletIn)
{
- g_signals.UpdatedBlockTip.connect(boost::bind(&CValidationInterface::UpdatedBlockTip, pwalletIn, _1));
- g_signals.SyncTransaction.connect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2, _3));
- g_signals.SetBestChain.connect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, _1));
- g_signals.Inventory.connect(boost::bind(&CValidationInterface::Inventory, pwalletIn, _1));
- g_signals.Broadcast.connect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn, _1, _2));
- g_signals.BlockChecked.connect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2));
- g_signals.ScriptForMining.connect(boost::bind(&CValidationInterface::GetScriptForMining, pwalletIn, _1));
- g_signals.NewPoWValidBlock.connect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, _1, _2));
- g_signals.SystemMessage.connect(boost::bind(&CValidationInterface::SystemMessage, pwalletIn, _1));
- g_signals.PacketComplete.connect(boost::bind(&CValidationInterface::PacketComplete, pwalletIn, _1));
+ g_signals.UpdatedBlockTip.connect(boost::bind(&CValidationInterface::UpdatedBlockTip, pwalletIn, std::placeholders::_1));
+ g_signals.SyncTransaction.connect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+ g_signals.SetBestChain.connect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, std::placeholders::_1));
+ g_signals.Inventory.connect(boost::bind(&CValidationInterface::Inventory, pwalletIn, std::placeholders::_1));
+ g_signals.Broadcast.connect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn, std::placeholders::_1, std::placeholders::_2));
+ g_signals.BlockChecked.connect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, std::placeholders::_1, std::placeholders::_2));
+ g_signals.ScriptForMining.connect(boost::bind(&CValidationInterface::GetScriptForMining, pwalletIn, std::placeholders::_1));
+ g_signals.NewPoWValidBlock.connect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, std::placeholders::_1, std::placeholders::_2));
+ g_signals.SystemMessage.connect(boost::bind(&CValidationInterface::SystemMessage, pwalletIn, std::placeholders::_1));
+ g_signals.PacketComplete.connect(boost::bind(&CValidationInterface::PacketComplete, pwalletIn, std::placeholders::_1));
}
void UnregisterValidationInterface(CValidationInterface *pwalletIn)
{
- g_signals.BlockChecked.disconnect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2));
- g_signals.ScriptForMining.disconnect(boost::bind(&CValidationInterface::GetScriptForMining, pwalletIn, _1));
- g_signals.Broadcast.disconnect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn, _1, _2));
- g_signals.Inventory.disconnect(boost::bind(&CValidationInterface::Inventory, pwalletIn, _1));
- g_signals.SetBestChain.disconnect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, _1));
- g_signals.SyncTransaction.connect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2, _3));
- g_signals.UpdatedBlockTip.disconnect(boost::bind(&CValidationInterface::UpdatedBlockTip, pwalletIn, _1));
- g_signals.NewPoWValidBlock.disconnect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, _1, _2));
- g_signals.SystemMessage.disconnect(boost::bind(&CValidationInterface::SystemMessage, pwalletIn, _1));
- g_signals.PacketComplete.disconnect(boost::bind(&CValidationInterface::PacketComplete, pwalletIn, _1));
+ g_signals.BlockChecked.disconnect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, std::placeholders::_1, std::placeholders::_2));
+ g_signals.ScriptForMining.disconnect(boost::bind(&CValidationInterface::GetScriptForMining, pwalletIn, std::placeholders::_1));
+ g_signals.Broadcast.disconnect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn, std::placeholders::_1, std::placeholders::_2));
+ g_signals.Inventory.disconnect(boost::bind(&CValidationInterface::Inventory, pwalletIn, std::placeholders::_1));
+ g_signals.SetBestChain.disconnect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, std::placeholders::_1));
+ g_signals.SyncTransaction.connect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+ g_signals.UpdatedBlockTip.disconnect(boost::bind(&CValidationInterface::UpdatedBlockTip, pwalletIn, std::placeholders::_1));
+ g_signals.NewPoWValidBlock.disconnect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, std::placeholders::_1, std::placeholders::_2));
+ g_signals.SystemMessage.disconnect(boost::bind(&CValidationInterface::SystemMessage, pwalletIn, std::placeholders::_1));
+ g_signals.PacketComplete.disconnect(boost::bind(&CValidationInterface::PacketComplete, pwalletIn, std::placeholders::_1));
}
void UnregisterAllValidationInterfaces()
