From 41406bfa1747a9c1038355a3ed4c5e455591afe8 Mon Sep 17 00:00:00 2001 From: John-Gee Date: Tue, 22 Dec 2020 06:25:23 -0800 Subject: Fix for Boost 1.74 --- src/validationinterface.cpp | 75 +++++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 20 deletions(-) (limited to 'src/validationinterface.cpp') diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp index d4121a28b..c34d7d326 100644 --- a/src/validationinterface.cpp +++ b/src/validationinterface.cpp @@ -5,6 +5,8 @@ #include "validationinterface.h" +#include + static CMainSignals g_signals; CMainSignals& GetMainSignals() @@ -13,29 +15,62 @@ CMainSignals& GetMainSignals() } void RegisterValidationInterface(CValidationInterface* pwalletIn) { - g_signals.UpdatedBlockTip.connect(boost::bind(&CValidationInterface::UpdatedBlockTip, pwalletIn, _1, _2, _3)); - g_signals.SyncTransaction.connect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2, _3)); - g_signals.UpdatedTransaction.connect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1)); - 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.BlockFound.connect(boost::bind(&CValidationInterface::ResetRequestCount, pwalletIn, _1)); - g_signals.NewPoWValidBlock.connect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, _1, _2)); + g_signals.UpdatedBlockTip.connect(boost::bind(&CValidationInterface::UpdatedBlockTip, + pwalletIn, boost::placeholders::_1, + boost::placeholders::_2, + boost::placeholders::_3)); + g_signals.SyncTransaction.connect(boost::bind(&CValidationInterface::SyncTransaction, + pwalletIn, boost::placeholders::_1, + boost::placeholders::_2, + boost::placeholders::_3)); + g_signals.UpdatedTransaction.connect(boost::bind(&CValidationInterface::UpdatedTransaction, + pwalletIn, boost::placeholders::_1)); + g_signals.SetBestChain.connect(boost::bind(&CValidationInterface::SetBestChain, + pwalletIn, boost::placeholders::_1)); + g_signals.Inventory.connect(boost::bind(&CValidationInterface::Inventory, + pwalletIn, boost::placeholders::_1)); + g_signals.Broadcast.connect(boost::bind(&CValidationInterface::ResendWalletTransactions, + pwalletIn, boost::placeholders::_1, boost::placeholders::_2)); + g_signals.BlockChecked.connect(boost::bind(&CValidationInterface::BlockChecked, + pwalletIn, boost::placeholders::_1, + boost::placeholders::_2)); + g_signals.ScriptForMining.connect(boost::bind(&CValidationInterface::GetScriptForMining, + pwalletIn, boost::placeholders::_1)); + g_signals.BlockFound.connect(boost::bind(&CValidationInterface::ResetRequestCount, + pwalletIn, boost::placeholders::_1)); + g_signals.NewPoWValidBlock.connect(boost::bind(&CValidationInterface::NewPoWValidBlock, + pwalletIn, boost::placeholders::_1, + boost::placeholders::_2)); } void UnregisterValidationInterface(CValidationInterface* pwalletIn) { - g_signals.BlockFound.disconnect(boost::bind(&CValidationInterface::ResetRequestCount, pwalletIn, _1)); - g_signals.ScriptForMining.disconnect(boost::bind(&CValidationInterface::GetScriptForMining, pwalletIn, _1)); - g_signals.BlockChecked.disconnect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2)); - 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.UpdatedTransaction.disconnect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1)); - g_signals.SyncTransaction.disconnect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2, _3)); - g_signals.UpdatedBlockTip.disconnect(boost::bind(&CValidationInterface::UpdatedBlockTip, pwalletIn, _1, _2, _3)); - g_signals.NewPoWValidBlock.disconnect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, _1, _2)); + g_signals.BlockFound.disconnect(boost::bind(&CValidationInterface::ResetRequestCount, + pwalletIn, boost::placeholders::_1)); + g_signals.ScriptForMining.disconnect(boost::bind(&CValidationInterface::GetScriptForMining, + pwalletIn, boost::placeholders::_1)); + g_signals.BlockChecked.disconnect(boost::bind(&CValidationInterface::BlockChecked, + pwalletIn, boost::placeholders::_1, + boost::placeholders::_2)); + g_signals.Broadcast.disconnect(boost::bind(&CValidationInterface::ResendWalletTransactions, + pwalletIn, boost::placeholders::_1, + boost::placeholders::_2)); + g_signals.Inventory.disconnect(boost::bind(&CValidationInterface::Inventory, + pwalletIn, boost::placeholders::_1)); + g_signals.SetBestChain.disconnect(boost::bind(&CValidationInterface::SetBestChain, + pwalletIn, boost::placeholders::_1)); + g_signals.UpdatedTransaction.disconnect(boost::bind(&CValidationInterface::UpdatedTransaction, + pwalletIn, boost::placeholders::_1)); + g_signals.SyncTransaction.disconnect(boost::bind(&CValidationInterface::SyncTransaction, + pwalletIn, boost::placeholders::_1, + boost::placeholders::_2, + boost::placeholders::_3)); + g_signals.UpdatedBlockTip.disconnect(boost::bind(&CValidationInterface::UpdatedBlockTip, + pwalletIn, boost::placeholders::_1, + boost::placeholders::_2, + boost::placeholders::_3)); + g_signals.NewPoWValidBlock.disconnect(boost::bind(&CValidationInterface::NewPoWValidBlock, + pwalletIn, boost::placeholders::_1, + boost::placeholders::_2)); } void UnregisterAllValidationInterfaces() { -- cgit v1.2.3