diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp --- a/src/bench/checkblock.cpp +++ b/src/bench/checkblock.cpp @@ -20,8 +20,8 @@ static void DeserializeBlockTest(benchmark::State &state) { CDataStream stream((const char *)block_bench::block413567, - (const char *)&block_bench::block413567[sizeof( - block_bench::block413567)], + (const char *)block_bench::block413567 + + sizeof(block_bench::block413567), SER_NETWORK, PROTOCOL_VERSION); char a = '\0'; stream.write(&a, 1); // Prevent compaction @@ -36,8 +36,8 @@ static void DeserializeAndCheckBlockTest(benchmark::State &state) { CDataStream stream((const char *)block_bench::block413567, - (const char *)&block_bench::block413567[sizeof( - block_bench::block413567)], + (const char *)block_bench::block413567 + + sizeof(block_bench::block413567), SER_NETWORK, PROTOCOL_VERSION); char a = '\0'; stream.write(&a, 1); // Prevent compaction diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -2489,28 +2489,28 @@ ScriptError err; std::vector> directStack; BOOST_CHECK(EvalScript(directStack, - CScript(&direct[0], &direct[sizeof(direct)]), + CScript(direct, direct + sizeof(direct)), SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), &err)); BOOST_CHECK_MESSAGE(err == ScriptError::OK, ScriptErrorString(err)); std::vector> pushdata1Stack; - BOOST_CHECK(EvalScript( - pushdata1Stack, CScript(&pushdata1[0], &pushdata1[sizeof(pushdata1)]), - SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), &err)); + BOOST_CHECK(EvalScript(pushdata1Stack, + CScript(pushdata1, pushdata1 + sizeof(pushdata1)), + SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), &err)); BOOST_CHECK(pushdata1Stack == directStack); BOOST_CHECK_MESSAGE(err == ScriptError::OK, ScriptErrorString(err)); std::vector> pushdata2Stack; - BOOST_CHECK(EvalScript( - pushdata2Stack, CScript(&pushdata2[0], &pushdata2[sizeof(pushdata2)]), - SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), &err)); + BOOST_CHECK(EvalScript(pushdata2Stack, + CScript(pushdata2, pushdata2 + sizeof(pushdata2)), + SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), &err)); BOOST_CHECK(pushdata2Stack == directStack); BOOST_CHECK_MESSAGE(err == ScriptError::OK, ScriptErrorString(err)); std::vector> pushdata4Stack; - BOOST_CHECK(EvalScript( - pushdata4Stack, CScript(&pushdata4[0], &pushdata4[sizeof(pushdata4)]), - SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), &err)); + BOOST_CHECK(EvalScript(pushdata4Stack, + CScript(pushdata4, pushdata4 + sizeof(pushdata4)), + SCRIPT_VERIFY_P2SH, BaseSignatureChecker(), &err)); BOOST_CHECK(pushdata4Stack == directStack); BOOST_CHECK_MESSAGE(err == ScriptError::OK, ScriptErrorString(err));