Browse Source

Merge branch 'master' of https://github.com/GOSTSec/gostcoin

pull/5/head
orignal 7 years ago
parent
commit
664dada4a3
  1. 0
      .gitmodules
  2. 4
      src/main.cpp

0
.gitmodules vendored

4
src/main.cpp

@ -4349,7 +4349,7 @@ public: @@ -4349,7 +4349,7 @@ public:
CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
{
// Create new block
auto_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate());
unique_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate());
if(!pblocktemplate.get())
return NULL;
CBlock *pblock = &pblocktemplate->block; // pointer for convenience
@ -4718,7 +4718,7 @@ void static GostcoinMiner(CWallet *pwallet) @@ -4718,7 +4718,7 @@ void static GostcoinMiner(CWallet *pwallet)
unsigned int nTransactionsUpdatedLast = nTransactionsUpdated;
CBlockIndex* pindexPrev = pindexBest;
auto_ptr<CBlockTemplate> pblocktemplate(CreateNewBlockWithKey(reservekey));
unique_ptr<CBlockTemplate> pblocktemplate(CreateNewBlockWithKey(reservekey));
if (!pblocktemplate.get())
return;
CBlock *pblock = &pblocktemplate->block;

Loading…
Cancel
Save