Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Should fix std::min issues related to size_t

This commit is contained in:
Thomas Winget 2015-01-19 17:39:38 -05:00
parent 34883599bc
commit acd4c369e4
No known key found for this signature in database
GPG Key ID: 58131A160789E630
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptonote_core/blockchain.cpp
View File

@ -616,7 +616,7 @@ difficulty_type Blockchain::get_difficulty_for_next_block() const
std::vector<difficulty_type> cumulative_difficulties; std::vector<difficulty_type> cumulative_difficulties;
auto h = m_db->height(); auto h = m_db->height();
size_t offset = h - std::min(h, static_cast<size_t>(DIFFICULTY_BLOCKS_COUNT)); size_t offset = h - std::min<size_t>(h, static_cast<size_t>(DIFFICULTY_BLOCKS_COUNT));
if (offset == 0) if (offset == 0)
{ {
@ -892,7 +892,7 @@ void Blockchain::get_last_n_blocks_sizes(std::vector<size_t>& sz, size_t count)
return; return;
// add size of last <count> blocks to vector <sz> (or less, if blockchain size < count) // add size of last <count> blocks to vector <sz> (or less, if blockchain size < count)
size_t start_offset = h - std::min(h, count); size_t start_offset = h - std::min<size_t>(h, count);
for(size_t i = start_offset; i < h; i++) for(size_t i = start_offset; i < h; i++)
{ {
sz.push_back(m_db->get_block_size(i)); sz.push_back(m_db->get_block_size(i));