Move comment to right spot #9869

pull RHavar wants to merge 2 commits into bitcoin:master from RHavar:comment changing 1 files +7 −7

RHavar commented at 12:25 AM on February 27, 2017: contributor

...and kill some extraneous whitespace
Move comment to right spot 6e7fa31245
fanquake added the label Docs and Output on Feb 27, 2017
Prefix vector with std:: 94433abf61
in src/wallet/wallet.cpp:None in 6e7fa31245 outdated
```
2149 | +
2150 |      pair<CAmount, pair<const CWalletTx*,unsigned int> > coinLowestLarger;
2151 |      coinLowestLarger.first = std::numeric_limits<CAmount>::max();
2152 |      coinLowestLarger.second.first = NULL;
2153 | -    vector<pair<CAmount, pair<const CWalletTx*,unsigned int> > > vValue;
2154 | +    vector<pair<CAmount, pair<const CWalletTx*,unsigned int> > > vValue; // List of values less than target
```
dcousens commented at 12:35 AM on February 27, 2017:

std:: (might as well...)

benma commented at 5:05 AM on February 27, 2017:

I think the previous comment location was correct, as it is not only about this line, but all the lines that follow (the BOOST_FOREACH block below, which populates the vector). The few lines above is also needed for that.

Adding std:: only here is a bit pointless, the whole file uses vector, set, pair etc. unqualified. Even the pair on the same line is not qualified. Maybe a separate PR could explicitly qualify all of them, if preferred. Personally, I would like it.

in src/wallet/wallet.cpp:None in 94433abf61

2148 | @@ -2149,7 +2149,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMin
2149 |      pair<CAmount, pair<const CWalletTx*,unsigned int> > coinLowestLarger;
2150 |      coinLowestLarger.first = std::numeric_limits<CAmount>::max();
2151 |      coinLowestLarger.second.first = NULL;
2152 | -    vector<pair<CAmount, pair<const CWalletTx*,unsigned int> > > vValue; // List of values less than target
2153 | +    std::vector<pair<CAmount, pair<const CWalletTx*,unsigned int> > > vValue; // List of values less than target

laanwj commented at 11:37 AM on February 28, 2017:

This is already done (for the entire file) by @kallewoof in https://github.com/bitcoin/bitcoin/pull/9643

RHavar closed this on Feb 28, 2017
RHavar deleted the branch on Oct 2, 2018
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels