diff options
| author | Johnson Lau <[email protected]> | 2017-09-22 14:27:03 +0800 |
|---|---|---|
| committer | Johnson Lau <[email protected]> | 2017-09-22 14:27:03 +0800 |
| commit | 3a131b72446724b2d6322930d92348065f1c1891 (patch) | |
| tree | 0698d945e1ea75ae4ee2874699010f277d4cbc33 /src/validation.h | |
| parent | [Refactor] Combine scriptPubKey and amount as CTxOut in CScriptCheck (diff) | |
| download | discoin-3a131b72446724b2d6322930d92348065f1c1891.tar.xz discoin-3a131b72446724b2d6322930d92348065f1c1891.zip | |
Rename out to m_tx_out in CScriptCheck
Diffstat (limited to 'src/validation.h')
| -rw-r--r-- | src/validation.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/validation.h b/src/validation.h index 69751b8c6..9cd9fe536 100644 --- a/src/validation.h +++ b/src/validation.h @@ -355,7 +355,7 @@ bool CheckSequenceLocks(const CTransaction &tx, int flags, LockPoints* lp = null class CScriptCheck { private: - CTxOut out; + CTxOut m_tx_out; const CTransaction *ptxTo; unsigned int nIn; unsigned int nFlags; @@ -366,13 +366,13 @@ private: public: CScriptCheck(): ptxTo(nullptr), nIn(0), nFlags(0), cacheStore(false), error(SCRIPT_ERR_UNKNOWN_ERROR) {} CScriptCheck(const CTxOut& outIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn, bool cacheIn, PrecomputedTransactionData* txdataIn) : - out(outIn), ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), cacheStore(cacheIn), error(SCRIPT_ERR_UNKNOWN_ERROR), txdata(txdataIn) { } + m_tx_out(outIn), ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), cacheStore(cacheIn), error(SCRIPT_ERR_UNKNOWN_ERROR), txdata(txdataIn) { } bool operator()(); void swap(CScriptCheck &check) { std::swap(ptxTo, check.ptxTo); - std::swap(out, check.out); + std::swap(m_tx_out, check.m_tx_out); std::swap(nIn, check.nIn); std::swap(nFlags, check.nFlags); std::swap(cacheStore, check.cacheStore); |