highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-05 04:31:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Avoid the use of P0083R3 std::set::merge"

Browse Source 
This reverts commit 6cf4ea71878c0a83f2e49831e4dfa119c53761b7.
This commit is contained in:
MarcoFalke 2022-01-26 08:57:56 +00:00
parent fab53b5fd4
commit fae20e6b50
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/script/standard.cpp
View File

@ -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));
}
}