From 6cf4ea71878c0a83f2e49831e4dfa119c53761b7 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Fri, 25 Jun 2021 10:30:08 -0700 Subject: Avoid the use of P0083R3 std::set::merge --- src/script/standard.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/script') diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 0fa5e56eb6..b8349bb9ab 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -407,7 +407,13 @@ void TaprootSpendData::Merge(TaprootSpendData other) merkle_root = other.merkle_root; } for (auto& [key, control_blocks] : other.scripts) { - scripts[key].merge(std::move(control_blocks)); + // 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)); + } } } -- cgit v1.2.3