Merge #9587: Do not shadow local variable named tx.

laanwj · laanwj · commit 10dc58a2aa79 · 2017-01-26T10:15:21.000+01:00
44f2baa Do not shadow local variable named `tx`. (Pavel Janík)
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1877,8 +1877,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             }
         }
 
-        for (const CTransactionRef& tx : lRemovedTxn)
-            AddToCompactExtraTransactions(tx);
+        for (const CTransactionRef& removedTx : lRemovedTxn)
+            AddToCompactExtraTransactions(removedTx);
 
         int nDoS = 0;
         if (state.IsInvalid(nDoS))

Original file line number	Diff line number	Diff line change
`@@ -1877,8 +1877,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`1877`	`1877`	`}`
`1878`	`1878`	`}`
`1879`	`1879`
`1880`		`- for (const CTransactionRef& tx : lRemovedTxn)`
`1881`		`- AddToCompactExtraTransactions(tx);`
	`1880`	`+ for (const CTransactionRef& removedTx : lRemovedTxn)`
	`1881`	`+ AddToCompactExtraTransactions(removedTx);`
`1882`	`1882`
`1883`	`1883`	`int nDoS = 0;`
`1884`	`1884`	`if (state.IsInvalid(nDoS))`