monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4067

Browse source 
9a39b7d wallet2: fix build for windows (std::max again) (moneromooo-monero)
This commit is contained in:
luigi1111 2018-06-27 21:28:34 -05:00
commit a9b83f5a6e
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/wallet/wallet2.cpp
View file

@ -1694,7 +1694,7 @@ void wallet2::get_short_chain_history(std::list<crypto::hash>& ids, uint64_t gra
{
size_t i = 0;
size_t current_multiplier = 1;
size_t blockchain_size = std::max(m_blockchain.size() / granularity * granularity, m_blockchain.offset());
size_t blockchain_size = std::max((size_t)(m_blockchain.size() / granularity * granularity), m_blockchain.offset());
size_t sz = blockchain_size - m_blockchain.offset();
if(!sz)
{