From 2af6794fcff6f32a0064f9d9201aa37118c94699 Mon Sep 17 00:00:00 2001
From: Johnson Lau <jl2012@xbt.hk>
Date: Fri, 22 Sep 2017 14:27:03 +0800
Subject: [PATCH] Rename out to m_tx_out in CScriptCheck

---
 src/validation.cpp | 2 +-
 src/validation.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index f3bdfe0029a97..78acf5a5f5a71 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1071,7 +1071,7 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache &inputs, int nHeight, b
 bool CScriptCheck::operator()()
 {
     const CScript& scriptSig = ptxTo->vin[nIn].scriptSig;
-    return VerifyScript(scriptSig, out.scriptPubKey, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, out.nValue, cacheStore, *precomTxData), ptxTo->GetRequiredSigVersion(), &error);
+    return VerifyScript(scriptSig, m_tx_out.scriptPubKey, nFlags, CachingTransactionSignatureChecker(ptxTo, nIn, m_tx_out.nValue, cacheStore, *precomTxData), ptxTo->GetRequiredSigVersion(), &error);
 }
 
 int GetSpendHeight(const CCoinsViewCache& inputs)
diff --git a/src/validation.h b/src/validation.h
index 07690ea2a3073..d653c9f00225d 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -285,7 +285,7 @@ Optional<int> GetUTXOHeight(const COutPoint& outpoint);
 class CScriptCheck
 {
 private:
-    CTxOut out;
+    CTxOut m_tx_out;
     const CTransaction* ptxTo;
     unsigned int nIn;
     unsigned int nFlags;
@@ -296,7 +296,7 @@ class CScriptCheck
 public:
     CScriptCheck() : ptxTo(0), nIn(0), nFlags(0), cacheStore(false), error(SCRIPT_ERR_UNKNOWN_ERROR), precomTxData(nullptr) {}
     CScriptCheck(const CTxOut& outIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn, bool cacheIn, PrecomputedTransactionData* cachedHashesIn) :
-        out(outIn),
+        m_tx_out(outIn),
         ptxTo(&txToIn),
         nIn(nInIn),
         nFlags(nFlagsIn),
@@ -309,7 +309,7 @@ class CScriptCheck
     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);