Merge pull request #4067

9a39b7d wallet2: fix build for windows (std::max again) (moneromooo-monero)
6 years ago · a9b83f5a6e
parent 65c09beaf7 9a39b7dd7f
commit a9b83f5a6e
1 changed files with 1 additions and 1 deletions
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@ -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)
  {