aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/script/standard.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 5fb98cc307..7e32754d6c 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -366,13 +366,7 @@ void TaprootSpendData::Merge(TaprootSpendData other)
merkle_root = other.merkle_root;
}
for (auto& [key, control_blocks] : other.scripts) {
- // Once P0083R3 is supported by all our targeted platforms,
- // this loop body can be replaced with:
- // scripts[key].merge(std::move(control_blocks));
- auto& target = scripts[key];
- for (auto& control_block: control_blocks) {
- target.insert(std::move(control_block));
- }
+ scripts[key].merge(std::move(control_blocks));
}
}