diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-01 11:28:51 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-01 11:28:55 +0200 |
| commit | 3fd192f8b4d6db386354dfe635a8a6a105b55de8 (patch) | |
| tree | 39f8a9caf006a6fe38d89b98a57fb94c56f3cd28 /src/main.h | |
| parent | b25551101c7ceff8af862131c30c08527ff60160 (diff) | |
| parent | c122f5528c882efc8aebe31fd4d84612175f66aa (diff) | |
Merge pull request #4234
c122f55 qt: Register CAmount metatype (Wladimir J. van der Laan)
a372168 Use a typedef for monetary values (Mark Friedenbach)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h index c75841538f..7e849505dd 100644 --- a/src/main.h +++ b/src/main.h @@ -172,7 +172,7 @@ std::string GetWarnings(std::string strFor); bool GetTransaction(const uint256 &hash, CTransaction &tx, uint256 &hashBlock, bool fAllowSlow = false); /** Find the best known block, and make it the tip of the block chain */ bool ActivateBestChain(CValidationState &state, CBlock *pblock = NULL); -int64_t GetBlockValue(int nHeight, int64_t nFees); +CAmount GetBlockValue(int nHeight, const CAmount& nFees); /** Create a new block index entry for a given block hash */ CBlockIndex * InsertBlockIndex(uint256 hash); @@ -220,7 +220,7 @@ struct CDiskTxPos : public CDiskBlockPos }; -int64_t GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowFree); +CAmount GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowFree); // // Check transaction inputs, and make sure any @@ -591,7 +591,7 @@ extern CBlockTreeDB *pblocktree; struct CBlockTemplate { CBlock block; - std::vector<int64_t> vTxFees; + std::vector<CAmount> vTxFees; std::vector<int64_t> vTxSigOps; }; |