Skip to content

Commit fae20e6

Browse files
author
MarcoFalke
committed
Revert "Avoid the use of P0083R3 std::set::merge"
This reverts commit 6cf4ea7.
1 parent fab53b5 commit fae20e6

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

src/script/standard.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -366,13 +366,7 @@ void TaprootSpendData::Merge(TaprootSpendData other)
366366
merkle_root = other.merkle_root;
367367
}
368368
for (auto& [key, control_blocks] : other.scripts) {
369-
// Once P0083R3 is supported by all our targeted platforms,
370-
// this loop body can be replaced with:
371-
// scripts[key].merge(std::move(control_blocks));
372-
auto& target = scripts[key];
373-
for (auto& control_block: control_blocks) {
374-
target.insert(std::move(control_block));
375-
}
369+
scripts[key].merge(std::move(control_blocks));
376370
}
377371
}
378372

0 commit comments

Comments
 (0)