mirror of
https://github.com/cygnusxi/CurecoinSource.git
synced 2025-07-27 15:44:25 +02:00
changed placeholders back to boost:: from std::; fixed #define warning
This commit is contained in:
parent
dc9d6ec533
commit
42ba35b3e4
@ -4,11 +4,13 @@
|
|||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
#ifndef _curecoinRPC_H_
|
#ifndef _curecoinRPC_H_
|
||||||
#define _curecoinRPC_H_ 1
|
#define _curecoinRPC_H_
|
||||||
|
|
||||||
#if BOOST_VERSION >= 106600
|
#if BOOST_VERSION >= 106600
|
||||||
|
#ifndef BOOST_ASIO_ENABLE_OLD_SERVICES
|
||||||
#define BOOST_ASIO_ENABLE_OLD_SERVICES
|
#define BOOST_ASIO_ENABLE_OLD_SERVICES
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <list>
|
#include <list>
|
||||||
|
@ -9,8 +9,6 @@
|
|||||||
#include "walletdb.h" // for BackupWallet
|
#include "walletdb.h" // for BackupWallet
|
||||||
#include "base58.h"
|
#include "base58.h"
|
||||||
|
|
||||||
#include <functional>
|
|
||||||
|
|
||||||
#include <QSet>
|
#include <QSet>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
@ -337,21 +335,21 @@ static void NotifyTransactionChanged(WalletModel *walletmodel, CWallet *wallet,
|
|||||||
void WalletModel::subscribeToCoreSignals()
|
void WalletModel::subscribeToCoreSignals()
|
||||||
{
|
{
|
||||||
// Connect signals to wallet
|
// Connect signals to wallet
|
||||||
wallet->NotifyStatusChanged.connect(boost::bind(&NotifyKeyStoreStatusChanged, this, std::placeholders::_1));
|
wallet->NotifyStatusChanged.connect(boost::bind(&NotifyKeyStoreStatusChanged, this, boost::placeholders::_1));
|
||||||
wallet->NotifyAddressBookChanged.connect(boost::bind(NotifyAddressBookChanged, this, std::placeholders::_1, std::placeholders::_2,
|
wallet->NotifyAddressBookChanged.connect(boost::bind(NotifyAddressBookChanged, this, boost::placeholders::_1, boost::placeholders::_2,
|
||||||
std::placeholders::_3, std::placeholders::_4, std::placeholders::_5));
|
boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5));
|
||||||
wallet->NotifyTransactionChanged.connect(boost::bind(NotifyTransactionChanged, this, std::placeholders::_1, std::placeholders::_2,
|
wallet->NotifyTransactionChanged.connect(boost::bind(NotifyTransactionChanged, this, boost::placeholders::_1, boost::placeholders::_2,
|
||||||
std::placeholders::_3));
|
boost::placeholders::_3));
|
||||||
}
|
}
|
||||||
|
|
||||||
void WalletModel::unsubscribeFromCoreSignals()
|
void WalletModel::unsubscribeFromCoreSignals()
|
||||||
{
|
{
|
||||||
// Disconnect signals from wallet
|
// Disconnect signals from wallet
|
||||||
wallet->NotifyStatusChanged.disconnect(boost::bind(&NotifyKeyStoreStatusChanged, this, std::placeholders::_1));
|
wallet->NotifyStatusChanged.disconnect(boost::bind(&NotifyKeyStoreStatusChanged, this, boost::placeholders::_1));
|
||||||
wallet->NotifyAddressBookChanged.disconnect(boost::bind(NotifyAddressBookChanged, this, std::placeholders::_1, boost::placeholders::_2,
|
wallet->NotifyAddressBookChanged.disconnect(boost::bind(NotifyAddressBookChanged, this, boost::placeholders::_1, boost::placeholders::_2,
|
||||||
std::placeholders::_3, std::placeholders::_4, std::placeholders::_5));
|
boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5));
|
||||||
wallet->NotifyTransactionChanged.disconnect(boost::bind(NotifyTransactionChanged, this, std::placeholders::_1, std::placeholders::_2,
|
wallet->NotifyTransactionChanged.disconnect(boost::bind(NotifyTransactionChanged, this, boost::placeholders::_1, boost::placeholders::_2,
|
||||||
std::placeholders::_3));
|
boost::placeholders::_3));
|
||||||
}
|
}
|
||||||
|
|
||||||
// WalletModel::UnlockContext implementation
|
// WalletModel::UnlockContext implementation
|
||||||
|
Loading…
x
Reference in New Issue
Block a user