monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use 'boost' mutex instead of 'std' mutex

Browse source
This commit is contained in:
cslashm 2018-04-09 16:52:33 +02:00
parent 2c274e05fe
commit 94b899db26
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/wallet/wallet2.cpp
View file

@ -1009,7 +1009,7 @@ void wallet2::set_unspent(size_t idx)
void wallet2::check_acc_out_precomp(const tx_out &o, const crypto::key_derivation &derivation, const std::vector<crypto::key_derivation> &additional_derivations, size_t i, tx_scan_info_t &tx_scan_info) const void wallet2::check_acc_out_precomp(const tx_out &o, const crypto::key_derivation &derivation, const std::vector<crypto::key_derivation> &additional_derivations, size_t i, tx_scan_info_t &tx_scan_info) const
{ {
hw::device &hwdev = m_account.get_device(); hw::device &hwdev = m_account.get_device();
std::unique_lock<hw::device> hwdev_lock (hwdev); boost::unique_lock<hw::device> hwdev_lock (hwdev);
hwdev.set_mode(hw::device::TRANSACTION_PARSE); hwdev.set_mode(hw::device::TRANSACTION_PARSE);
if (o.target.type() != typeid(txout_to_key)) if (o.target.type() != typeid(txout_to_key))
{ {
@ -1087,7 +1087,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
//ensure device is let in NONE mode in any case //ensure device is let in NONE mode in any case
hw::device &hwdev = m_account.get_device(); hw::device &hwdev = m_account.get_device();
std::unique_lock<hw::device> hwdev_lock (hwdev); boost::unique_lock<hw::device> hwdev_lock (hwdev);
hw::reset_mode rst(hwdev); hw::reset_mode rst(hwdev);
hwdev_lock.unlock(); hwdev_lock.unlock();
@ -7304,7 +7304,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
{ {
//ensure device is let in NONE mode in any case //ensure device is let in NONE mode in any case
hw::device &hwdev = m_account.get_device(); hw::device &hwdev = m_account.get_device();
std::unique_lock<hw::device> hwdev_lock (hwdev); boost::unique_lock<hw::device> hwdev_lock (hwdev);
hw::reset_mode rst(hwdev); hw::reset_mode rst(hwdev);
if(m_light_wallet) { if(m_light_wallet) {
@ -7887,7 +7887,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_from(const crypton
{ {
//ensure device is let in NONE mode in any case //ensure device is let in NONE mode in any case
hw::device &hwdev = m_account.get_device(); hw::device &hwdev = m_account.get_device();
std::unique_lock<hw::device> hwdev_lock (hwdev); boost::unique_lock<hw::device> hwdev_lock (hwdev);
hw::reset_mode rst(hwdev); hw::reset_mode rst(hwdev);
uint64_t accumulated_fee, accumulated_outputs, accumulated_change; uint64_t accumulated_fee, accumulated_outputs, accumulated_change;