diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-10-27 09:05:07 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-10-27 09:05:07 +0000 |
| commit | 6df4e67cd210295e710fff8942195459da82fbaa (patch) | |
| tree | 59caa11aa9cd543e4025d22e9b0bfc0cf90cfc9e /src/wallet | |
| parent | Merge pull request #450 (diff) | |
| download | monero-6df4e67cd210295e710fff8942195459da82fbaa.tar.xz | |
Fix a possibly-unused warning, and rationalize types
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 10 | ||||
| -rw-r--r-- | src/wallet/wallet2.h | 8 |
2 files changed, 9 insertions, 9 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 { diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index a8c7f9b78..91c2cf094 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -213,9 +213,9 @@ namespace tools */ bool is_deprecated() const; void refresh(); - void refresh(uint64_t start_height, size_t & blocks_fetched); - void refresh(uint64_t start_height, size_t & blocks_fetched, bool& received_money); - bool refresh(size_t & blocks_fetched, bool& received_money, bool& ok); + void refresh(uint64_t start_height, uint64_t & blocks_fetched); + void refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& received_money); + bool refresh(uint64_t & blocks_fetched, bool& received_money, bool& ok); bool testnet() const { return m_testnet; } bool restricted() const { return m_restricted; } @@ -318,7 +318,7 @@ namespace tools bool is_tx_spendtime_unlocked(uint64_t unlock_time) const; bool is_transfer_unlocked(const transfer_details& td) const; bool clear(); - void pull_blocks(uint64_t start_height, size_t& blocks_added); + void pull_blocks(uint64_t start_height, uint64_t& blocks_added); uint64_t select_transfers(uint64_t needed_money, bool add_dust, uint64_t dust, std::list<transfer_container::iterator>& selected_transfers); bool prepare_file_names(const std::string& file_path); void process_unconfirmed(const cryptonote::transaction& tx); |