From fae20e6b50306f91c74037e915aa0ab75a0a6b3b Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 26 Jan 2022 08:57:56 +0000 Subject: Revert "Avoid the use of P0083R3 std::set::merge" This reverts commit 6cf4ea71878c0a83f2e49831e4dfa119c53761b7. --- src/script/standard.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src') 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)); } } -- cgit v1.2.3