Merge bd6af53e1f into merged_master (Bitcoin PR #20480)

what a trainwreck of a programming language..
This commit is contained in:
Andrew Poelstra 2021-06-17 14:43:32 +00:00
commit acf709b3ab
20 changed files with 119 additions and 129 deletions

View file

@ -874,7 +874,7 @@ static RPCHelpMan dumpassetlabels()
};
}
class BlindingPubkeyAdderVisitor : public boost::static_visitor<>
class BlindingPubkeyAdderVisitor
{
public:
CPubKey blind_key;
@ -950,7 +950,7 @@ static RPCHelpMan createblindedaddress()
key.Set(keydata.begin(), keydata.end());
// Append blinding key and return
boost::apply_visitor(BlindingPubkeyAdderVisitor(key), address);
std::visit(BlindingPubkeyAdderVisitor(key), address);
return EncodeDestination(address);
},
};