aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-06-28 00:46:38 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-06-28 00:47:48 +0100
commit9a39b7dd7ff032620278f5636b7fd84c477d7695 (patch)
treef39b285929d69642f281c73ca41ec660cb9eb98f /src
parentMerge pull request #3907 (diff)
downloadmonero-9a39b7dd7ff032620278f5636b7fd84c477d7695.tar.xz
wallet2: fix build for windows (std::max again)
Diffstat (limited to 'src')
-rw-r--r--src/wallet/wallet2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 28049fe92..e5e331797 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)
{