diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-09-27 13:25:42 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-09-27 13:25:54 +0200 |
| commit | 920ca1f0bf0b786250e3119a05984e0c2af1350a (patch) | |
| tree | 72ffd41a7d512d1a71dd6e8701c3bcb7f9849d5a /src/test/script_tests.cpp | |
| parent | Merge #8803: Ping regularly in p2p-segwit.py to keep connection alive (diff) | |
| parent | Do not shadow variables (diff) | |
| download | discoin-920ca1f0bf0b786250e3119a05984e0c2af1350a.tar.xz discoin-920ca1f0bf0b786250e3119a05984e0c2af1350a.zip | |
Merge #8655: Do not shadow variables (trivials)
4731cab Do not shadow variables (Pavel JanÃk)
Diffstat (limited to 'src/test/script_tests.cpp')
| -rw-r--r-- | src/test/script_tests.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 5a9aaf9bc..dad82baed 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -323,10 +323,10 @@ public: return *this; } - TestBuilder& Add(const CScript& script) + TestBuilder& Add(const CScript& _script) { DoPush(); - spendTx.vin[0].scriptSig += script; + spendTx.vin[0].scriptSig += _script; return *this; } @@ -343,8 +343,8 @@ public: return *this; } - TestBuilder& Push(const CScript& script) { - DoPush(std::vector<unsigned char>(script.begin(), script.end())); + TestBuilder& Push(const CScript& _script) { + DoPush(std::vector<unsigned char>(_script.begin(), _script.end())); return *this; } |