Merge #7977: [trivial] Add missing const qualifiers.

f7c4f79 [trivial] Add missing const qualifiers. (Daniel Kraft)
This commit is contained in:
Wladimir J. van der Laan 2016-05-05 12:52:28 +02:00
commit e8d917591f
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
3 changed files with 4 additions and 4 deletions

View file

@ -1468,7 +1468,7 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::P
if (fAllowSlow) { // use coin database to locate block that contains transaction, and scan it if (fAllowSlow) { // use coin database to locate block that contains transaction, and scan it
int nHeight = -1; int nHeight = -1;
{ {
CCoinsViewCache &view = *pcoinsTip; const CCoinsViewCache& view = *pcoinsTip;
const CCoins* coins = view.AccessCoins(hash); const CCoins* coins = view.AccessCoins(hash);
if (coins) if (coins)
nHeight = coins->nHeight; nHeight = coins->nHeight;

View file

@ -885,7 +885,7 @@ bool CTxMemPool::HasNoInputsOf(const CTransaction &tx) const
return true; return true;
} }
CCoinsViewMemPool::CCoinsViewMemPool(CCoinsView *baseIn, CTxMemPool &mempoolIn) : CCoinsViewBacked(baseIn), mempool(mempoolIn) { } CCoinsViewMemPool::CCoinsViewMemPool(CCoinsView* baseIn, const CTxMemPool& mempoolIn) : CCoinsViewBacked(baseIn), mempool(mempoolIn) { }
bool CCoinsViewMemPool::GetCoins(const uint256 &txid, CCoins &coins) const { bool CCoinsViewMemPool::GetCoins(const uint256 &txid, CCoins &coins) const {
// If an entry in the mempool exists, always return that one, as it's guaranteed to never // If an entry in the mempool exists, always return that one, as it's guaranteed to never

View file

@ -672,10 +672,10 @@ private:
class CCoinsViewMemPool : public CCoinsViewBacked class CCoinsViewMemPool : public CCoinsViewBacked
{ {
protected: protected:
CTxMemPool &mempool; const CTxMemPool& mempool;
public: public:
CCoinsViewMemPool(CCoinsView *baseIn, CTxMemPool &mempoolIn); CCoinsViewMemPool(CCoinsView* baseIn, const CTxMemPool& mempoolIn);
bool GetCoins(const uint256 &txid, CCoins &coins) const; bool GetCoins(const uint256 &txid, CCoins &coins) const;
bool HaveCoins(const uint256 &txid) const; bool HaveCoins(const uint256 &txid) const;
}; };