monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 04:29:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #1566

Browse source 
176b70a0 account: fix build error involving std::max and different types (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-01-14 09:26:59 -05:00
commit d98db4868d
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cryptonote_core/account.cpp
View file

@ -82,7 +82,9 @@ DISABLE_VS_WARNINGS(4244 4345)
if (recover) if (recover)
{ {
m_creation_timestamp = std::max(mktime(&timestamp), (long)0); m_creation_timestamp = mktime(&timestamp);
if (m_creation_timestamp == (uint64_t)-1) // failure
m_creation_timestamp = 0; // lowest value
} }
else else
{ {
@ -105,7 +107,9 @@ DISABLE_VS_WARNINGS(4244 4345)
timestamp.tm_min = 0; timestamp.tm_min = 0;
timestamp.tm_sec = 0; timestamp.tm_sec = 0;
m_creation_timestamp = std::max(mktime(&timestamp), (long)0); m_creation_timestamp = mktime(&timestamp);
if (m_creation_timestamp == (uint64_t)-1) // failure
m_creation_timestamp = 0; // lowest value
} }
//----------------------------------------------------------------- //-----------------------------------------------------------------
void account_base::create_from_viewkey(const cryptonote::account_public_address& address, const crypto::secret_key& viewkey) void account_base::create_from_viewkey(const cryptonote::account_public_address& address, const crypto::secret_key& viewkey)