Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-26 15:09:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4240

Browse Source 
83f5587 blockchain: use uint64_t for height, not size_t (moneromooo-monero)
This commit is contained in:
luigi1111 2018-08-22 20:58:55 -05:00
commit ec6982f8eb
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_core/blockchain.cpp
View File

@ -2317,7 +2317,7 @@ bool Blockchain::find_blockchain_supplement(const uint64_t req_start_block, cons
total_height = get_current_blockchain_height(); total_height = get_current_blockchain_height();
size_t count = 0, size = 0; size_t count = 0, size = 0;
blocks.reserve(std::min(std::min(max_count, (size_t)10000), (size_t)(total_height - start_height))); 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.resize(blocks.size()+1);
blocks.back().first.first = m_db->get_block_blob_from_height(i); blocks.back().first.first = m_db->get_block_blob_from_height(i);