GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bd6af53e1f into merged_master (Bitcoin PR #20480)

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

12
src/rpc/util.cpp
View file

@ -212,7 +212,7 @@ CTxDestination AddAndGetMultisigDestination(const int required, const std::vecto
return dest;
}
class DescribeAddressVisitor : public boost::static_visitor<UniValue>
class DescribeAddressVisitor
{
public:
explicit DescribeAddressVisitor() {}
@ -278,7 +278,7 @@ public:
UniValue DescribeAddress(const CTxDestination& dest)
{
return boost::apply_visitor(DescribeAddressVisitor(), dest);
return std::visit(DescribeAddressVisitor(), dest);
}
unsigned int ParseConfirmTarget(const UniValue& value, unsigned int max_target)
@ -889,7 +889,7 @@ UniValue GetServicesNames(ServiceFlags services)
//
// ELEMENTS
class BlindingPubkeyVisitor : public boost::static_visitor<CPubKey>
class BlindingPubkeyVisitor
{
public:
explicit BlindingPubkeyVisitor() {}
@ -931,14 +931,14 @@ public:
};
CPubKey GetDestinationBlindingKey(const CTxDestination& dest) {
return boost::apply_visitor(BlindingPubkeyVisitor(), dest);
return std::visit(BlindingPubkeyVisitor(), dest);
}
bool IsBlindDestination(const CTxDestination& dest) {
return GetDestinationBlindingKey(dest).IsFullyValid();
}
class DescribeBlindAddressVisitor : public boost::static_visitor<UniValue>
class DescribeBlindAddressVisitor
{
public:
@ -1019,7 +1019,7 @@ public:
UniValue DescribeBlindAddress(const CTxDestination& dest)
{
UniValue ret(UniValue::VOBJ);
ret.pushKVs(boost::apply_visitor(DescribeBlindAddressVisitor(), dest));
ret.pushKVs(std::visit(DescribeBlindAddressVisitor(), dest));
return ret;
}