Merge #10500: Avoid CWalletTx copies in GetAddressBalances and GetAddressGroupings

sipa · sipa · commit 098b01dc58ff · 2017-06-02T16:10:33.000-07:00
b9b814a Avoid CWalletTx copies in GetAddressBalances and GetAddressGroupings (Russell Yanofsky) Tree-SHA512: 96a0612ca460ba1bfb3921f3aa348400fd3afa12c40f2ca1f3f04068b1574fe824d577e0123013d8898a4990084316dc1dfb541331849f0996ceff7f4eb25e6b
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3261,9 +3261,9 @@ std::map<CTxDestination, CAmount> CWallet::GetAddressBalances()
 
     {
         LOCK(cs_wallet);
-        BOOST_FOREACH(PAIRTYPE(uint256, CWalletTx) walletEntry, mapWallet)
+        for (const auto& walletEntry : mapWallet)
         {
-            CWalletTx *pcoin = &walletEntry.second;
+            const CWalletTx *pcoin = &walletEntry.second;
 
             if (!pcoin->IsTrusted())
                 continue;
@@ -3301,9 +3301,9 @@ std::set< std::set<CTxDestination> > CWallet::GetAddressGroupings()
     std::set< std::set<CTxDestination> > groupings;
     std::set<CTxDestination> grouping;
 
-    BOOST_FOREACH(PAIRTYPE(uint256, CWalletTx) walletEntry, mapWallet)
+    for (const auto& walletEntry : mapWallet)
     {
-        CWalletTx *pcoin = &walletEntry.second;
+        const CWalletTx *pcoin = &walletEntry.second;
 
         if (pcoin->tx->vin.size() > 0)
         {

Original file line number	Diff line number	Diff line change
`@@ -3261,9 +3261,9 @@ std::map<CTxDestination, CAmount> CWallet::GetAddressBalances()`
`3261`	`3261`
`3262`	`3262`	`{`
`3263`	`3263`	`LOCK(cs_wallet);`
`3264`		`- BOOST_FOREACH(PAIRTYPE(uint256, CWalletTx) walletEntry, mapWallet)`
	`3264`	`+ for (const auto& walletEntry : mapWallet)`
`3265`	`3265`	`{`
`3266`		`- CWalletTx *pcoin = &walletEntry.second;`
	`3266`	`+ const CWalletTx *pcoin = &walletEntry.second;`
`3267`	`3267`
`3268`	`3268`	`if (!pcoin->IsTrusted())`
`3269`	`3269`	`continue;`
`@@ -3301,9 +3301,9 @@ std::set< std::set<CTxDestination> > CWallet::GetAddressGroupings()`
`3301`	`3301`	`std::set< std::set<CTxDestination> > groupings;`
`3302`	`3302`	`std::set<CTxDestination> grouping;`
`3303`	`3303`
`3304`		`- BOOST_FOREACH(PAIRTYPE(uint256, CWalletTx) walletEntry, mapWallet)`
	`3304`	`+ for (const auto& walletEntry : mapWallet)`
`3305`	`3305`	`{`
`3306`		`- CWalletTx *pcoin = &walletEntry.second;`
	`3306`	`+ const CWalletTx *pcoin = &walletEntry.second;`
`3307`	`3307`
`3308`	`3308`	`if (pcoin->tx->vin.size() > 0)`
`3309`	`3309`	`{`