diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-06-27 21:28:34 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-06-27 21:28:34 -0500 |
| commit | a9b83f5a6e0bdd493f4283627fc15be5e25c82f0 (patch) | |
| tree | 28591b286a7796b824a2b915364e6816db8fc5fe /src | |
| parent | Merge pull request #4069 (diff) | |
| parent | wallet2: fix build for windows (std::max again) (diff) | |
| download | monero-a9b83f5a6e0bdd493f4283627fc15be5e25c82f0.tar.xz | |
Merge pull request #4067
9a39b7d wallet2: fix build for windows (std::max again) (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index f07736ebd..1a1537e62 100644 --- 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) { |