diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-09-27 13:25:42 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-09-27 13:25:54 +0200 |
| commit | 920ca1f0bf0b786250e3119a05984e0c2af1350a (patch) | |
| tree | 72ffd41a7d512d1a71dd6e8701c3bcb7f9849d5a /src/key.cpp | |
| parent | Merge #8803: Ping regularly in p2p-segwit.py to keep connection alive (diff) | |
| parent | Do not shadow variables (diff) | |
| download | discoin-920ca1f0bf0b786250e3119a05984e0c2af1350a.tar.xz discoin-920ca1f0bf0b786250e3119a05984e0c2af1350a.zip | |
Merge #8655: Do not shadow variables (trivials)
4731cab Do not shadow variables (Pavel JanÃk)
Diffstat (limited to 'src/key.cpp')
| -rw-r--r-- | src/key.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/key.cpp b/src/key.cpp index 79023566c..aae9b042a 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -243,12 +243,12 @@ bool CKey::Derive(CKey& keyChild, ChainCode &ccChild, unsigned int nChild, const return ret; } -bool CExtKey::Derive(CExtKey &out, unsigned int nChild) const { +bool CExtKey::Derive(CExtKey &out, unsigned int _nChild) const { out.nDepth = nDepth + 1; CKeyID id = key.GetPubKey().GetID(); memcpy(&out.vchFingerprint[0], &id, 4); - out.nChild = nChild; - return key.Derive(out.key, out.chaincode, nChild, chaincode); + out.nChild = _nChild; + return key.Derive(out.key, out.chaincode, _nChild, chaincode); } void CExtKey::SetMaster(const unsigned char *seed, unsigned int nSeedLen) { |