Merge pull request #4067

9a39b7d wallet2: fix build for windows (std::max again) (moneromooo-monero)
monero-project · Jun 28, 2018 · a9b83f5 · a9b83f5
2 parents 65c09be + 9a39b7d
commit a9b83f5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)
   {