Merge #10108: ApproximateBestSubset should take inputs by reference, not value

5335132 ApproximateBestSubset should take inputs by reference, not value (Ryan Havar)

Tree-SHA512: 0990de7efbeba8ef9b70ccee45298c2fb982459a64e44b6395f7d28808740315d2d26e87103d4848677fc519cdf3247c1bde498ecb2e239e18134cb933e6b661
This commit is contained in:
Pieter Wuille 2017-03-28 18:17:25 -07:00 committed by Pasta
parent bfd63c179d
commit 05cb5a058e
No known key found for this signature in database
GPG Key ID: 0B8EB7A31A44D9C6

View File

@ -2558,7 +2558,7 @@ void CWallet::AvailableCoins(std::vector<COutput>& vCoins, bool fOnlySafe, const
}
}
static void ApproximateBestSubset(std::vector<std::pair<CAmount, std::pair<const CWalletTx*,unsigned int> > >vValue, const CAmount& nTotalLower, const CAmount& nTargetValue,
static void ApproximateBestSubset(const std::vector<std::pair<CAmount, std::pair<const CWalletTx*,unsigned int> > >& vValue, const CAmount& nTotalLower, const CAmount& nTargetValue,
std::vector<char>& vfBest, CAmount& nBest, bool fUseInstantSend = false, int iterations = 1000)
{
std::vector<char> vfIncluded;
@ -4011,7 +4011,7 @@ bool CWallet::SetDefaultKey(const CPubKey &vchPubKey)
/**
* Mark old keypool keys as used,
* and generate all new keys
* and generate all new keys
*/
bool CWallet::NewKeyPool()
{