diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-27 13:25:42 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-27 13:25:54 +0200 |
| commit | 920ca1f0bf0b786250e3119a05984e0c2af1350a (patch) | |
| tree | 72ffd41a7d512d1a71dd6e8701c3bcb7f9849d5a /src/pubkey.cpp | |
| parent | 6e54c85439b6ce8913841f384864bef03a138b95 (diff) | |
| parent | 4731cab8fbff51a8178c85d572e2482040278616 (diff) | |
Merge #8655: Do not shadow variables (trivials)
4731cab Do not shadow variables (Pavel JanÃk)
Diffstat (limited to 'src/pubkey.cpp')
| -rw-r--r-- | src/pubkey.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pubkey.cpp b/src/pubkey.cpp index be4ee27cd4..91a657593a 100644 --- a/src/pubkey.cpp +++ b/src/pubkey.cpp @@ -264,12 +264,12 @@ void CExtPubKey::Decode(const unsigned char code[BIP32_EXTKEY_SIZE]) { pubkey.Set(code+41, code+BIP32_EXTKEY_SIZE); } -bool CExtPubKey::Derive(CExtPubKey &out, unsigned int nChild) const { +bool CExtPubKey::Derive(CExtPubKey &out, unsigned int _nChild) const { out.nDepth = nDepth + 1; CKeyID id = pubkey.GetID(); memcpy(&out.vchFingerprint[0], &id, 4); - out.nChild = nChild; - return pubkey.Derive(out.pubkey, out.chaincode, nChild, chaincode); + out.nChild = _nChild; + return pubkey.Derive(out.pubkey, out.chaincode, _nChild, chaincode); } /* static */ bool CPubKey::CheckLowS(const std::vector<unsigned char>& vchSig) { |