mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-15 12:51:00 +02:00
Merge 99b06b7f1d into merged_master (Bitcoin PR bitcoin/bitcoin#29369)
This commit is contained in:
commit
2f02b6235c
2 changed files with 12 additions and 14 deletions
|
|
@ -491,11 +491,11 @@ protected:
|
|||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
public:
|
||||
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) { }
|
||||
template <std::input_iterator InputIterator>
|
||||
CScript(InputIterator first, InputIterator last) : CScriptBase{first, last} { }
|
||||
|
||||
SERIALIZE_METHODS(CScript, obj) { READWRITE(AsBase<CScriptBase>(obj)); }
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue