diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-06-29 16:50:54 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-06-29 16:50:59 +0200 |
| commit | dbadf746e26840b68cb3b01a690aa46256ae2191 (patch) | |
| tree | fbb93e061bc83997f94f3509cdfc82ad5c8d0c74 /src/script | |
| parent | 1269cab21a9ac32f9ee8adfb9041950756eff3e4 (diff) | |
| parent | fa3b35a189c4a4fd9667ef0af1c7059471ac8b01 (diff) | |
| download | bitcoin-dbadf746e26840b68cb3b01a690aa46256ae2191.tar.xz | |
Merge #19333: refactor: Fix clang compile failure
fa3b35a189c4a4fd9667ef0af1c7059471ac8b01 ci: Add test for clang-3.8 C++11 support (MarcoFalke)
faa7431fee45b26f7ac2f5fd0b8874cb6afafbd4 refactor: 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:
ACK fa3b35a189c4a4fd9667ef0af1c7059471ac8b01
Tree-SHA512: b3251208945b44530224aadbc10fef1260b479c0b43a5e345501fbfd3579a9fe354b946090e023232852bbb99759da4429b58b137b7b286ddac6bd7960851f7f
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/standard.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 39dd4ff39f..251be8d271 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -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) |