diff options
| author | Matt Corallo <git@bluematt.me> | 2016-10-15 14:01:31 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2016-12-04 00:13:09 -0800 |
| commit | 2736c44c8edea5ce6a502a04269926fecda27301 (patch) | |
| tree | 069bbf0a1a075266d34779da13685d8d162ff29a /src/validation.h | |
| parent | ae4db44d0341b7517d02bdc74d4b69d0cd2f6778 (diff) | |
| download | bitcoin-2736c44c8edea5ce6a502a04269926fecda27301.tar.xz | |
Make the optional pblock in ActivateBestChain a shared_ptr
Diffstat (limited to 'src/validation.h')
| -rw-r--r-- | src/validation.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/validation.h b/src/validation.h index a798cf3702..2d055d1900 100644 --- a/src/validation.h +++ b/src/validation.h @@ -278,7 +278,7 @@ std::string GetWarnings(const std::string& strFor); /** Retrieve a transaction (from memory pool, or from disk, if possible) */ bool GetTransaction(const uint256 &hash, CTransaction &tx, const Consensus::Params& params, uint256 &hashBlock, bool fAllowSlow = false); /** Find the best known block, and make it the tip of the block chain */ -bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, const CBlock* pblock = NULL); +bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, std::shared_ptr<const CBlock> pblock = std::shared_ptr<const CBlock>()); CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams); /** |