diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-05-02 13:07:14 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-05-02 13:08:02 +0200 |
| commit | 86b800c6a299455580fe76e5fb43218f0222e179 (patch) | |
| tree | 9f0bb9c9d92eece4a5df29b183b6b3c8d6e11b62 /src/miner.cpp | |
| parent | 0ad104190465d8d65c2344bbe10dcf3df025d86c (diff) | |
| parent | 07e4edb056249e017b0e5a4783e4452ce892b52d (diff) | |
| download | bitcoin-86b800c6a299455580fe76e5fb43218f0222e179.tar.xz | |
Merge #7964: Minor changes for c++11 consistency
07e4edb auto_ptr → unique_ptr (Wladimir J. van der Laan)
073225c chain: define enum used as bit field as uint32_t (Wladimir J. van der Laan)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index ef8fd4db43..eaf29a767b 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -74,7 +74,7 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& scriptPubKeyIn) { // Create new block - auto_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate()); + std::unique_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate()); if(!pblocktemplate.get()) return NULL; CBlock *pblock = &pblocktemplate->block; // pointer for convenience |