diff --git a/src/prevector.h b/src/prevector.h index 6dcc305268..f7970daa45 100644 --- a/src/prevector.h +++ b/src/prevector.h @@ -50,7 +50,6 @@ public: T* ptr{}; public: typedef Diff difference_type; - typedef T value_type; typedef T* pointer; typedef T& reference; using element_type = T; @@ -102,7 +101,6 @@ public: const T* ptr{}; public: typedef Diff difference_type; - typedef const T value_type; typedef const T* pointer; typedef const T& reference; using element_type = const T; diff --git a/src/script/script.h b/src/script/script.h index 035152ee51..a11e73517a 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -429,11 +429,11 @@ protected: } return *this; } + public: CScript() = default; - CScript(const_iterator pbegin, const_iterator pend) : CScriptBase(pbegin, pend) { } - CScript(std::vector::const_iterator pbegin, std::vector::const_iterator pend) : CScriptBase(pbegin, pend) { } - CScript(const unsigned char* pbegin, const unsigned char* pend) : CScriptBase(pbegin, pend) { } + template + CScript(InputIterator first, InputIterator last) : CScriptBase{first, last} { } SERIALIZE_METHODS(CScript, obj) { READWRITE(AsBase(obj)); }