mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-19 13:27:35 +02:00
Merge 5215c80edc into merged_master (Bitcoin PR bitcoin/bitcoin#25709)
This commit is contained in:
commit
50a5a78d8d
1 changed files with 1 additions and 1 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue