diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-09-08 01:11:23 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-09-08 01:16:54 +0200 |
commit | efb4383ef6c69e801ddca160a53e7fb4ee8b156a (patch) | |
tree | 9e2f3b36fcb979c35253d96d2911e95226730d27 /src/script | |
parent | 723e5806578be90ba0f6b953629cf7389e6a27cd (diff) | |
parent | 592404f03f2b734351d734f0c9ca1fdce997321b (diff) | |
download | bitcoin-efb4383ef6c69e801ddca160a53e7fb4ee8b156a.tar.xz |
Merge #10793: Changing &var[0] to var.data()
592404f03 Changing &vec[0] to vec.data(), what 9804 missed (MeshCollider)
Pull request description:
This just continues the work of https://github.com/bitcoin/bitcoin/pull/9804
Modifies a lot of `&vector[]`'s to `vector.data()`'s across all the files including tests, just the stuff that 9804 missed
Tree-SHA512: dd1a9dffb999dea4fba78dcc91fe02f90250db86f5c74948e1ff3e8b4036b2154b600555eaa04dece5368920aae3513bc36425dc96e4319ca1041b0928a6b656
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/interpreter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index f9716dfc66..7315500e3b 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1366,7 +1366,7 @@ static bool VerifyWitnessProgram(const CScriptWitness& witness, int witversion, stack = std::vector<std::vector<unsigned char> >(witness.stack.begin(), witness.stack.end() - 1); uint256 hashScriptPubKey; CSHA256().Write(&scriptPubKey[0], scriptPubKey.size()).Finalize(hashScriptPubKey.begin()); - if (memcmp(hashScriptPubKey.begin(), &program[0], 32)) { + if (memcmp(hashScriptPubKey.begin(), program.data(), 32)) { return set_error(serror, SCRIPT_ERR_WITNESS_PROGRAM_MISMATCH); } } else if (program.size() == 20) { |