diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-10-30 09:57:35 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-10-30 09:57:41 +0200 |
| commit | 62b0984e65822c91992d6e081e73c8ca228180e6 (patch) | |
| tree | cb34308b6e2ead8b8d3c0990b516e5fd41dc6594 /src/wallet/wallet2.cpp | |
| parent | Merge pull request #453 (diff) | |
| parent | Fix a possibly-unused warning, and rationalize types (diff) | |
| download | monero-62b0984e65822c91992d6e081e73c8ca228180e6.tar.xz | |
Merge pull request #455
6df4e67 Fix a possibly-unused warning, and rationalize types (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.cpp')
| -rw-r--r-- | src/wallet/wallet2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 92777d16b..167325525 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -349,7 +349,7 @@ void wallet2::get_short_chain_history(std::list<crypto::hash>& ids) const ids.push_back(m_blockchain[0]); } //---------------------------------------------------------------------------------------------------- -void wallet2::pull_blocks(uint64_t start_height, size_t& blocks_added) +void wallet2::pull_blocks(uint64_t start_height, uint64_t& blocks_added) { blocks_added = 0; cryptonote::COMMAND_RPC_GET_BLOCKS_FAST::request req = AUTO_VAL_INIT(req); @@ -400,17 +400,17 @@ void wallet2::refresh() refresh(0, blocks_fetched); } //---------------------------------------------------------------------------------------------------- -void wallet2::refresh(uint64_t start_height, size_t & blocks_fetched) +void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched) { bool received_money = false; refresh(start_height, blocks_fetched, received_money); } //---------------------------------------------------------------------------------------------------- -void wallet2::refresh(uint64_t start_height, size_t & blocks_fetched, bool& received_money) +void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& received_money) { received_money = false; blocks_fetched = 0; - size_t added_blocks = 0; + uint64_t added_blocks = 0; size_t try_count = 0; crypto::hash last_tx_hash_id = m_transfers.size() ? get_transaction_hash(m_transfers.back().m_tx) : null_hash; @@ -444,7 +444,7 @@ void wallet2::refresh(uint64_t start_height, size_t & blocks_fetched, bool& rece LOG_PRINT_L1("Refresh done, blocks received: " << blocks_fetched << ", balance: " << print_money(balance()) << ", unlocked: " << print_money(unlocked_balance())); } //---------------------------------------------------------------------------------------------------- -bool wallet2::refresh(size_t & blocks_fetched, bool& received_money, bool& ok) +bool wallet2::refresh(uint64_t & blocks_fetched, bool& received_money, bool& ok) { try { |