diff options
| author | NicolasDorier <nicolas.dorier@gmail.com> | 2017-04-07 09:38:33 +0000 |
|---|---|---|
| committer | NicolasDorier <nicolas.dorier@gmail.com> | 2017-04-08 03:50:14 +0000 |
| commit | fd44ac1e8b75f6f83cc0fea20ae721de163ff9cc (patch) | |
| tree | 34e749da0376002b34fb674804291526796e8c2a /src/wallet/wallet.h | |
| parent | df1ca9e93a61787ea7ad8743dfb400126a52b8e9 (diff) | |
| download | bitcoin-fd44ac1e8b75f6f83cc0fea20ae721de163ff9cc.tar.xz | |
[Wallet] Rename std::pair<const CWalletTx*, unsigned int> to CInputCoin
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index c714ddd090..a882cec778 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -475,7 +475,7 @@ public: }; - +using CInputCoin = std::pair<const CWalletTx*, unsigned int>; class COutput { @@ -632,7 +632,7 @@ private: * all coins from coinControl are selected; Never select unconfirmed coins * if they are not ours */ - bool SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAmount& nTargetValue, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl *coinControl = NULL) const; + bool SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAmount& nTargetValue, std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet, const CCoinControl *coinControl = NULL) const; CWalletDB *pwalletdbEncryption; @@ -780,7 +780,7 @@ public: * completion the coin set and corresponding actual target value is * assembled */ - bool SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, uint64_t nMaxAncestors, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet) const; + bool SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, uint64_t nMaxAncestors, std::vector<COutput> vCoins, std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet) const; bool IsSpent(const uint256& hash, unsigned int n) const; |