Merge 5215c80edc into merged_master (Bitcoin PR bitcoin/bitcoin#25709)

This commit is contained in:
Byron Hambly 2024-10-24 13:06:05 +02:00
commit 50a5a78d8d

View file

@ -664,7 +664,6 @@ CScript BuildScript(Ts&&... inputs)
int cnt{0};
([&ret, &cnt] (Ts&& input) {
cnt++;
if constexpr (std::is_same_v<std::remove_cv_t<std::remove_reference_t<Ts>>, CScript>) {
// If it is a CScript, extend ret with it. Move or copy the first element instead.
if (cnt == 0) {
@ -676,6 +675,7 @@ CScript BuildScript(Ts&&... inputs)
// Otherwise invoke CScript::operator<<.
ret << input;
}
cnt++;
} (std::forward<Ts>(inputs)), ...);
return ret;