Merge pull request #5308

60d1ecd change nSubsidy's type from int64_t to CAmount (HarryWu)
This commit is contained in:
Wladimir J. van der Laan 2014-12-05 11:11:18 +01:00
commit c78a18087f
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 1 additions and 1 deletions

View File

@ -1188,7 +1188,7 @@ bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex)
CAmount GetBlockValue(int nHeight, const CAmount& nFees)
{
int64_t nSubsidy = 50 * COIN;
CAmount nSubsidy = 50 * COIN;
int halvings = nHeight / Params().SubsidyHalvingInterval();
// Force block reward to zero when right shift is undefined.