Browse Source

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

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

Tree-SHA512: 0990de7efbeba8ef9b70ccee45298c2fb982459a64e44b6395f7d28808740315d2d26e87103d4848677fc519cdf3247c1bde498ecb2e239e18134cb933e6b661
0.15
Pieter Wuille 8 years ago
parent
commit
4e3efd47e0
No known key found for this signature in database
GPG Key ID: A636E97631F767E0
  1. 4
      src/wallet/wallet.cpp

4
src/wallet/wallet.cpp

@ -2023,7 +2023,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, int iterations = 1000) std::vector<char>& vfBest, CAmount& nBest, int iterations = 1000)
{ {
std::vector<char> vfIncluded; std::vector<char> vfIncluded;
@ -2885,7 +2885,7 @@ bool CWallet::SetDefaultKey(const CPubKey &vchPubKey)
/** /**
* Mark old keypool keys as used, * Mark old keypool keys as used,
* and generate all new keys * and generate all new keys
*/ */
bool CWallet::NewKeyPool() bool CWallet::NewKeyPool()
{ {

Loading…
Cancel
Save