diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-03 15:48:18 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-03 15:48:53 +0100 |
| commit | 75d012e8c7d0b2dfec0fe34807eabb4f661f4fb7 (patch) | |
| tree | 068cbf16562b5cfbb1887ffb55385a5f12b76059 /src/script/script.cpp | |
| parent | ba80a684cfef95233330de58af92ec4baec875fd (diff) | |
| parent | ad1ae7ae2e90a29fcfaaddee2d5acd025de72cbe (diff) | |
Merge #8808: Do not shadow variables (gcc set)
ad1ae7a Check and enable -Wshadow by default. (Pavel Janík)
9de90bb Do not shadow variables (gcc set) (Pavel Janík)
Tree-SHA512: 9517feb423dc8ddd63896016b25324673bfbe0bffa97f22996f59d7a3fcbdc2ebf2e43ac02bc067546f54e293e9b2f2514be145f867321e9031f895c063d9fb8
Diffstat (limited to 'src/script/script.cpp')
| -rw-r--r-- | src/script/script.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script/script.cpp b/src/script/script.cpp index 9f4741b1cd..01180a7d6d 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -186,18 +186,18 @@ unsigned int CScript::GetSigOpCount(const CScript& scriptSig) const // get the last item that the scriptSig // pushes onto the stack: const_iterator pc = scriptSig.begin(); - vector<unsigned char> data; + vector<unsigned char> vData; while (pc < scriptSig.end()) { opcodetype opcode; - if (!scriptSig.GetOp(pc, opcode, data)) + if (!scriptSig.GetOp(pc, opcode, vData)) return 0; if (opcode > OP_16) return 0; } /// ... and return its opcount: - CScript subscript(data.begin(), data.end()); + CScript subscript(vData.begin(), vData.end()); return subscript.GetSigOpCount(true); } |