diff options
| author | Pavel Janík <Pavel@Janik.cz> | 2016-09-07 13:45:13 +0200 |
|---|---|---|
| committer | Pavel Janík <Pavel@Janik.cz> | 2016-09-07 13:45:13 +0200 |
| commit | 125b946cb4412fdf92bc3a68e6030bf4ddfe752d (patch) | |
| tree | 20308c2c8e528c281f90517c4807b6f55ebfe57e | |
| parent | 5b2ea29cf4fd298346437bb16a54407f8c1f9dca (diff) | |
| download | bitcoin-125b946cb4412fdf92bc3a68e6030bf4ddfe752d.tar.xz | |
Do not shadow upper local variable 'send', prevent -Wshadow compiler warning.
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 4b42afb561..de16b0ca4a 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 |