Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

an attempt to fix macOS compilation

Browse source
This commit is contained in:
sowle 2024-04-04 18:01:26 +02:00
parent 3f1968837f
commit 60e8fcdc47
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/crypto/crypto-sugar.h
View file

@ -1043,7 +1043,7 @@ namespace crypto
void zero()
{
PUSH_GCC_WARNINGS
DISABLE_GCC_AND_CLANG_WARNING(class-memaccess)
DISABLE_GCC_WARNING(class-memaccess)
size_t size_bytes = sizeof(scalar_t) * size();
memset(data(), 0, size_bytes);
POP_GCC_WARNINGS

2
src/wallet/wallet2.h
View file

@ -1096,7 +1096,6 @@ namespace tools
ts_middle -= ts_middle % POS_SCAN_STEP;
uint64_t ts_window = std::min(ts_middle - ts_from, ts_to - ts_middle);
size_t pos_entry_index = 0;
for (size_t transfer_index = 0; transfer_index != m_transfers.size(); transfer_index++)
{
auto& tr = m_transfers[transfer_index];
@ -1164,7 +1163,6 @@ namespace tools
next_turn();
}
++pos_entry_index;
}
cxt.status = API_RETURN_CODE_NOT_FOUND;
return false;

5
src/wallet/wallet_rpc_server.cpp
View file

@ -816,9 +816,10 @@ namespace tools
res.amount_swept = 0;
res.bare_outs_swept = 0;
res.fee_spent = 0;
res.txs_sent = 0;
w.get_wallet()->sweep_bare_unspent_outputs(w.get_wallet()->get_account().get_public_address(), groups, static_cast<size_t&>(res.txs_sent), res.amount_swept, res.fee_spent, res.bare_outs_swept);
size_t txs_sent = 0;
w.get_wallet()->sweep_bare_unspent_outputs(w.get_wallet()->get_account().get_public_address(), groups, txs_sent, res.amount_swept, res.fee_spent, res.bare_outs_swept);
res.txs_sent = txs_sent;
return true;
WALLET_RPC_CATCH_TRY_ENTRY();