diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-05 11:11:18 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-05 11:11:24 +0100 |
| commit | c78a18087f76ae53ac421261f9704f5f666d484e (patch) | |
| tree | cd81b544ac8adb23ab49fd9b488e4980477ca403 /src/main.cpp | |
| parent | c932c47e3498334e4ffbdb99ead6ad674826657c (diff) | |
| parent | 60d1ecd378d8aeb366da566d9c791399d77ffafc (diff) | |
| download | bitcoin-c78a18087f76ae53ac421261f9704f5f666d484e.tar.xz | |
Merge pull request #5308
60d1ecd change nSubsidy's type from int64_t to CAmount (HarryWu)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 784e2569d9..60e1db6647 100644 --- 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. |