aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2018-08-22 20:58:55 -0500
committerluigi1111 <luigi1111w@gmail.com>2018-08-22 20:58:55 -0500
commitec6982f8eb93547ba30e230021d15d3bd0a9150f (patch)
tree7c7a3bacd377642fe135aebfef8d16575ff6f1f3
parentMerge pull request #4235 (diff)
parentblockchain: use uint64_t for height, not size_t (diff)
downloadmonero-ec6982f8eb93547ba30e230021d15d3bd0a9150f.tar.xz
Merge pull request #4240
83f5587 blockchain: use uint64_t for height, not size_t (moneromooo-monero)
-rw-r--r--src/cryptonote_core/blockchain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 6c878d3fc..e96dc6bb6 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -2317,7 +2317,7 @@ bool Blockchain::find_blockchain_supplement(const uint64_t req_start_block, cons
total_height = get_current_blockchain_height();
size_t count = 0, size = 0;
blocks.reserve(std::min(std::min(max_count, (size_t)10000), (size_t)(total_height - start_height)));
- for(size_t i = start_height; i < total_height && count < max_count && (size < FIND_BLOCKCHAIN_SUPPLEMENT_MAX_SIZE || count < 3); i++, count++)
+ for(uint64_t i = start_height; i < total_height && count < max_count && (size < FIND_BLOCKCHAIN_SUPPLEMENT_MAX_SIZE || count < 3); i++, count++)
{
blocks.resize(blocks.size()+1);
blocks.back().first.first = m_db->get_block_blob_from_height(i);