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/rpc/blockchain.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/rpc/blockchain.cpp')
| -rw-r--r-- | src/rpc/blockchain.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index f05f8ff35..91d3197cd 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -497,10 +497,10 @@ UniValue getmempoolancestors(const UniValue& params, bool fHelp) UniValue o(UniValue::VOBJ); BOOST_FOREACH(CTxMemPool::txiter ancestorIt, setAncestors) { const CTxMemPoolEntry &e = *ancestorIt; - const uint256& hash = e.GetTx().GetHash(); + const uint256& _hash = e.GetTx().GetHash(); UniValue info(UniValue::VOBJ); entryToJSON(info, e); - o.push_back(Pair(hash.ToString(), info)); + o.push_back(Pair(_hash.ToString(), info)); } return o; } @@ -561,10 +561,10 @@ UniValue getmempooldescendants(const UniValue& params, bool fHelp) UniValue o(UniValue::VOBJ); BOOST_FOREACH(CTxMemPool::txiter descendantIt, setDescendants) { const CTxMemPoolEntry &e = *descendantIt; - const uint256& hash = e.GetTx().GetHash(); + const uint256& _hash = e.GetTx().GetHash(); UniValue info(UniValue::VOBJ); entryToJSON(info, e); - o.push_back(Pair(hash.ToString(), info)); + o.push_back(Pair(_hash.ToString(), info)); } return o; } |