mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-18 13:17:55 +02:00
Merge 01dc38bd01 into merged_master (Bitcoin PR bitcoin/bitcoin#30406)
This commit is contained in:
commit
f810342eeb
58 changed files with 91 additions and 86 deletions
|
|
@ -492,7 +492,7 @@ protected:
|
|||
return *this;
|
||||
}
|
||||
public:
|
||||
CScript() { }
|
||||
CScript() = default;
|
||||
CScript(const_iterator pbegin, const_iterator pend) : CScriptBase(pbegin, pend) { }
|
||||
CScript(std::vector<unsigned char>::const_iterator pbegin, std::vector<unsigned char>::const_iterator pend) : CScriptBase(pbegin, pend) { }
|
||||
CScript(const unsigned char* pbegin, const unsigned char* pend) : CScriptBase(pbegin, pend) { }
|
||||
|
|
@ -652,7 +652,7 @@ struct CScriptWitness
|
|||
std::vector<std::vector<unsigned char> > stack{};
|
||||
|
||||
// Some compilers complain without a default constructor
|
||||
CScriptWitness() { }
|
||||
CScriptWitness() = default;
|
||||
|
||||
bool IsNull() const { return stack.empty(); }
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue