diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-15 15:15:34 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-15 16:01:29 +0200 |
| commit | 9ab7cbffce78da1e6b9ef360a0bc17efa791972d (patch) | |
| tree | 28f770eaf4594184c8074ae24ee0fda98cf6c97b /src/miner.h | |
| parent | ea2b425b00b01b5b6670fa39488caf146dac4642 (diff) | |
| parent | bebe7282ffbfbc260bfc020f1b62710fdfd07cb5 (diff) | |
| download | bitcoin-9ab7cbffce78da1e6b9ef360a0bc17efa791972d.tar.xz | |
Merge pull request #5998
bebe728 Chainparams: Refactor: Remove redundant AllowMinDifficultyBlocks() getter (Jorge Timón)
Diffstat (limited to 'src/miner.h')
| -rw-r--r-- | src/miner.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/miner.h b/src/miner.h index 5d5c9c86c7..0be3152d97 100644 --- a/src/miner.h +++ b/src/miner.h @@ -14,6 +14,7 @@ class CBlockIndex; class CReserveKey; class CScript; class CWallet; +namespace Consensus { class Params; }; struct CBlockTemplate { @@ -29,6 +30,6 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn); CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey); /** Modify the extranonce in a block */ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce); -void UpdateTime(CBlockHeader* block, const CBlockIndex* pindexPrev); +void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev); #endif // BITCOIN_MINER_H |