diff options
| author | Gavin Andresen <[email protected]> | 2014-10-27 13:40:24 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2014-10-27 13:42:01 -0400 |
| commit | 35ece7dd074e1cb1b00ffb89dc6a6de063145b53 (patch) | |
| tree | 650e7cc493cbae953e9c3813d08b0f73569dc91b /src/wallet.cpp | |
| parent | Merge pull request #5139 (diff) | |
| parent | Make CBlockIndex* returned by GetDepthInMainChain const. (diff) | |
| download | discoin-35ece7dd074e1cb1b00ffb89dc6a6de063145b53.tar.xz discoin-35ece7dd074e1cb1b00ffb89dc6a6de063145b53.zip | |
Merge pull request #5135
a31e8ba Make CBlockIndex* returned by GetDepthInMainChain const. (Daniel Kraft)
Signed-off-by: Gavin Andresen <[email protected]>
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 65944587f..3812c22fe 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -2298,7 +2298,7 @@ int CMerkleTx::SetMerkleBranch(const CBlock& block) return chainActive.Height() - pindex->nHeight + 1; } -int CMerkleTx::GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const +int CMerkleTx::GetDepthInMainChainINTERNAL(const CBlockIndex* &pindexRet) const { if (hashBlock == 0 || nIndex == -1) return 0; @@ -2324,7 +2324,7 @@ int CMerkleTx::GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const return chainActive.Height() - pindex->nHeight + 1; } -int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const +int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet) const { AssertLockHeld(cs_main); int nResult = GetDepthInMainChainINTERNAL(pindexRet); |