diff options
author | MarcoFalke <falke.marco@gmail.com> | 2022-01-26 08:57:56 +0000 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2022-03-04 14:13:55 +0000 |
commit | fae20e6b50306f91c74037e915aa0ab75a0a6b3b (patch) | |
tree | 4434c0743bedeaab9da74afc8d888d8eab24cda7 /src/script/standard.cpp | |
parent | fab53b5fd45cf55a1d4d313e46ffce7396c9590e (diff) | |
download | bitcoin-fae20e6b50306f91c74037e915aa0ab75a0a6b3b.tar.xz |
Revert "Avoid the use of P0083R3 std::set::merge"
This reverts commit 6cf4ea71878c0a83f2e49831e4dfa119c53761b7.
Diffstat (limited to 'src/script/standard.cpp')
-rw-r--r-- | src/script/standard.cpp | 8 |
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)); } } |