highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-21 07:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use std::numeric_limits<> for typesafe INT_MAX/etc

Browse Source 
(this fixes a Mac OS X gitian build error for 0.5.x)
This commit is contained in:
Gavin Andresen
2011-12-19 17:08:25 -05:00
committed by Luke Dashjr
parent ca39829ecb
commit 5cd2a640a5
11 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rpc.cpp
View File

@@ -875,7 +875,7 @@ struct tallyitem
tallyitem()
{
nAmount = 0;
nConf = INT_MAX;
nConf = std::numeric_limits<int>::max();
}
};
@@ -927,7 +927,7 @@ Value ListReceived(const Array& params, bool fByAccounts)
continue;
int64 nAmount = 0;
int nConf = INT_MAX;
int nConf = std::numeric_limits<int>::max();
if (it != mapTally.end())
{
nAmount = (*it).second.nAmount;
@@ -947,7 +947,7 @@ Value ListReceived(const Array& params, bool fByAccounts)
obj.push_back(Pair("account", strAccount));
obj.push_back(Pair("label", strAccount)); // deprecated
obj.push_back(Pair("amount", ValueFromAmount(nAmount)));
obj.push_back(Pair("confirmations", (nConf == INT_MAX ? 0 : nConf)));
obj.push_back(Pair("confirmations", (nConf == std::numeric_limits<int>::max() ? 0 : nConf)));
ret.push_back(obj);
}
}
@@ -962,7 +962,7 @@ Value ListReceived(const Array& params, bool fByAccounts)
obj.push_back(Pair("account", (*it).first));
obj.push_back(Pair("label", (*it).first)); // deprecated
obj.push_back(Pair("amount", ValueFromAmount(nAmount)));
obj.push_back(Pair("confirmations", (nConf == INT_MAX ? 0 : nConf)));
obj.push_back(Pair("confirmations", (nConf == std::numeric_limits<int>::max() ? 0 : nConf)));
ret.push_back(obj);
}
}