Browse Source

miner: constify CreateNewBlock() arg scriptPubKeyIn

Conflicts:
	src/miner.cpp
	src/miner.h

Rebased-from: ad7d7cde5d30bcbfa7803c90daac7297b8a55e42
0.8
Jeff Garzik 11 years ago committed by Warren Togami
parent
commit
fbf54fb6da
  1. 2
      src/main.cpp
  2. 2
      src/main.h

2
src/main.cpp

@ -4186,7 +4186,7 @@ public:
} }
}; };
CBlockTemplate* CreateNewBlock(CScript& scriptPubKeyIn) CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
{ {
// Create new block // Create new block
auto_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate()); auto_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate());

2
src/main.h

@ -157,7 +157,7 @@ void ThreadScriptCheck();
/** Run the miner threads */ /** Run the miner threads */
void GenerateBitcoins(bool fGenerate, CWallet* pwallet); void GenerateBitcoins(bool fGenerate, CWallet* pwallet);
/** Generate a new block, without valid proof-of-work */ /** Generate a new block, without valid proof-of-work */
CBlockTemplate* CreateNewBlock(CScript& scriptPubKeyIn); CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn);
CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey); CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey);
/** Modify the extranonce in a block */ /** Modify the extranonce in a block */
void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce); void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce);

Loading…
Cancel
Save