BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge #9553: Use z = std::max(x - y, 0) instead of z = x - y; if (z < 0) z = 0; 

a47da4b Use z = std::max(x - y, 0); instead of z = x - y; if (z < 0) z = 0; (practicalswift)
This commit is contained in:
Wladimir J. van der Laan 2017-02-15 09:26:12 +01:00
parent a441db01b5 a47da4b6fe
commit 4c69d683f2
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/addrman.cpp
View File

@ -53,11 +53,7 @@ bool CAddrInfo::IsTerrible(int64_t nNow) const
double CAddrInfo::GetChance(int64_t nNow) const double CAddrInfo::GetChance(int64_t nNow) const
{ {
double fChance = 1.0; double fChance = 1.0;
int64_t nSinceLastTry = std::max<int64_t>(nNow - nLastTry, 0);
int64_t nSinceLastTry = nNow - nLastTry;
if (nSinceLastTry < 0)
nSinceLastTry = 0;
// deprioritize very recent attempts away // deprioritize very recent attempts away
if (nSinceLastTry < 60 * 10) if (nSinceLastTry < 60 * 10)

4
src/qt/coincontroldialog.cpp
View File

@ -563,9 +563,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
} }
// after fee // after fee
nAfterFee = nAmount - nPayFee; nAfterFee = std::max<CAmount>(nAmount - nPayFee, 0);
if (nAfterFee < 0)
nAfterFee = 0;
} }
// actually update labels // actually update labels