GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +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

9
src/script/standard.cpp
View file

@ -289,9 +289,8 @@ bool ExtractDestinations(const CScript& scriptPubKey, TxoutType& typeRet, std::v
return true;
}
namespace
{
class CScriptVisitor : public boost::static_visitor<CScript>
namespace {
class CScriptVisitor
{
public:
CScript operator()(const CNoDestination& dest) const
@ -337,7 +336,7 @@ public:
CScript GetScriptForDestination(const CTxDestination& dest)
{
return boost::apply_visitor(CScriptVisitor(), dest);
return std::visit(CScriptVisitor(), dest);
}
CScript GetScriptForRawPubKey(const CPubKey& pubKey)
@ -357,5 +356,5 @@ CScript GetScriptForMultisig(int nRequired, const std::vector<CPubKey>& keys)
}
bool IsValidDestination(const CTxDestination& dest) {
return dest.which() != 0;
return dest.index() != 0;
}