diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2011-07-11 21:49:45 +0200 |
|---|---|---|
| committer | Pieter Wuille <sipa@ulyssis.org> | 2011-12-17 21:49:48 +0100 |
| commit | 30ab2c9c46ce38197017ce6a6e13869617e692c7 (patch) | |
| tree | f87488e5baa4b81a94ebac62f3a7ee6da612b166 /src/main.cpp | |
| parent | 15a8590ecf6610387502be14d26657cb154d6201 (diff) | |
| download | bitcoin-30ab2c9c46ce38197017ce6a6e13869617e692c7.tar.xz | |
Preparations for key import/export
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index a7871fcc16..3a4e86512c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -516,7 +516,7 @@ bool CTransaction::RemoveFromMemoryPool() -int CMerkleTx::GetDepthInMainChain(int& nHeightRet) const +int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const { if (hashBlock == 0 || nIndex == -1) return 0; @@ -537,7 +537,7 @@ int CMerkleTx::GetDepthInMainChain(int& nHeightRet) const fMerkleVerified = true; } - nHeightRet = pindex->nHeight; + pindexRet = pindex; return pindexBest->nHeight - pindex->nHeight + 1; } |