diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-03-28 18:17:25 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-03-28 18:21:52 -0700 |
| commit | 4e3efd47e0d50c6cd1dc81ccc9669a5b2658f495 (patch) | |
| tree | 02c292251320a6bfc6ce38c730c69963719db154 /src | |
| parent | 0b9fb682890b8fe10cec54072b809a5efe57d33d (diff) | |
| parent | 53351321c4c002972b7553520085543c33da5aa1 (diff) | |
| download | bitcoin-4e3efd47e0d50c6cd1dc81ccc9669a5b2658f495.tar.xz | |
Merge #10108: ApproximateBestSubset should take inputs by reference, not value
5335132 ApproximateBestSubset should take inputs by reference, not value (Ryan Havar)
Tree-SHA512: 0990de7efbeba8ef9b70ccee45298c2fb982459a64e44b6395f7d28808740315d2d26e87103d4848677fc519cdf3247c1bde498ecb2e239e18134cb933e6b661
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 445e40b043..39e2ab7c1f 100644 --- a/src/wallet/wallet.cpp +++ b/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> vfIncluded; @@ -2885,7 +2885,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() { |