aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-09-09 10:23:54 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-09-09 10:25:39 +0200
commit4daf02a03f9ef4b06d7f2198ed7325ae68e117ba (patch)
treebe4df629ffcca37b36130805f042914fdbda60d8 /src
parent7f8b677aeb79abe5d52b18afb888d9a82204b276 (diff)
parent125b946cb4412fdf92bc3a68e6030bf4ddfe752d (diff)
downloadbitcoin-4daf02a03f9ef4b06d7f2198ed7325ae68e117ba.tar.xz
Merge #8677: Do not shadow upper local variable 'send', prevent -Wshadow compiler warning.
125b946 Do not shadow upper local variable 'send', prevent -Wshadow compiler warning. (Pavel Janík)
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 2c98de070a..43ffd8797e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4789,16 +4789,16 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
pfrom->PushMessage(NetMsgType::BLOCK, block);
else if (inv.type == MSG_FILTERED_BLOCK)
{
- bool send = false;
+ bool sendMerkleBlock = false;
CMerkleBlock merkleBlock;
{
LOCK(pfrom->cs_filter);
if (pfrom->pfilter) {
- send = true;
+ sendMerkleBlock = true;
merkleBlock = CMerkleBlock(block, *pfrom->pfilter);
}
}
- if (send) {
+ if (sendMerkleBlock) {
pfrom->PushMessage(NetMsgType::MERKLEBLOCK, merkleBlock);
// CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see
// This avoids hurting performance by pointlessly requiring a round-trip