Merge pull request #5308

laanwj · laanwj · commit c78a18087f76 · 2014-12-05T11:11:24.000+01:00
60d1ecd change nSubsidy's type from int64_t to CAmount (HarryWu)
diff --git a/src/main.cpp b/src/main.cpp
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -1188,7 +1188,7 @@ bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex)`
`1188`	`1188`
`1189`	`1189`	`CAmount GetBlockValue(int nHeight, const CAmount& nFees)`
`1190`	`1190`	`{`
`1191`		`- int64_t nSubsidy = 50 * COIN;`
	`1191`	`+ CAmount nSubsidy = 50 * COIN;`
`1192`	`1192`	`int halvings = nHeight / Params().SubsidyHalvingInterval();`
`1193`	`1193`
`1194`	`1194`	`// Force block reward to zero when right shift is undefined.`