mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-19 06:43:45 +01:00
Merge #19333: refactor: Fix clang compile failure
fa3b35a189ci: Add test for clang-3.8 C++11 support (MarcoFalke)faa7431feerefactor: Fix clang compile failure (MarcoFalke) Pull request description: Fix ``` script/standard.cpp:278:22: error: default initialization of an object of const type 'const (anonymous namespace)::CScriptVisitor' without a user-provided default constructor const CScriptVisitor g_script_visitor; ^ {} 1 error generated. ACKs for top commit: laanwj: ACKfa3b35a189Tree-SHA512: b3251208945b44530224aadbc10fef1260b479c0b43a5e345501fbfd3579a9fe354b946090e023232852bbb99759da4429b58b137b7b286ddac6bd7960851f7f
This commit is contained in:
@@ -290,14 +290,11 @@ public:
|
||||
return CScript() << CScript::EncodeOP_N(id.version) << std::vector<unsigned char>(id.program, id.program + id.length);
|
||||
}
|
||||
};
|
||||
|
||||
const CScriptVisitor g_script_visitor;
|
||||
|
||||
} // namespace
|
||||
|
||||
CScript GetScriptForDestination(const CTxDestination& dest)
|
||||
{
|
||||
return boost::apply_visitor(::g_script_visitor, dest);
|
||||
return boost::apply_visitor(CScriptVisitor{}, dest);
|
||||
}
|
||||
|
||||
CScript GetScriptForRawPubKey(const CPubKey& pubKey)
|
||||
|
||||
Reference in New Issue
Block a user