miner: constify CreateNewBlock() arg scriptPubKeyIn

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

Rebased-from: ad7d7cde5d30bcbfa7803c90daac7297b8a55e42
This commit is contained in:
Jeff Garzik 2013-08-25 20:16:23 -04:00 committed by Warren Togami
parent 6333bf9629
commit fbf54fb6da
2 changed files with 2 additions and 2 deletions

View File

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

View File

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