diff options
| -rw-r--r-- | src/serialize.h | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/src/serialize.h b/src/serialize.h index cfbbd1e940..8dd14cd0e3 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -643,8 +643,6 @@ template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_st * prevectors of unsigned char are a special case and are intended to be serialized as a single opaque blob. */ template<typename Stream, unsigned int N, typename T> inline void Serialize(Stream& os, const prevector<N, T>& v); -template<typename Stream, unsigned int N, typename T> void Unserialize_impl(Stream& is, prevector<N, T>& v, const unsigned char&); -template<typename Stream, unsigned int N, typename T, typename V> void Unserialize_impl(Stream& is, prevector<N, T>& v, const V&); template<typename Stream, unsigned int N, typename T> inline void Unserialize(Stream& is, prevector<N, T>& v); /** @@ -762,35 +760,25 @@ void Serialize(Stream& os, const prevector<N, T>& v) } -template<typename Stream, unsigned int N, typename T> -void Unserialize_impl(Stream& is, prevector<N, T>& v, const unsigned char&) +template <typename Stream, unsigned int N, typename T> +void Unserialize(Stream& is, prevector<N, T>& v) { - // Limit size per read so bogus size value won't cause out of memory - v.clear(); - unsigned int nSize = ReadCompactSize(is); - unsigned int i = 0; - while (i < nSize) - { - unsigned int blk = std::min(nSize - i, (unsigned int)(1 + 4999999 / sizeof(T))); - v.resize_uninitialized(i + blk); - is.read(AsWritableBytes(Span{&v[i], blk})); - i += blk; + if constexpr (std::is_same_v<T, unsigned char>) { + // Limit size per read so bogus size value won't cause out of memory + v.clear(); + unsigned int nSize = ReadCompactSize(is); + unsigned int i = 0; + while (i < nSize) { + unsigned int blk = std::min(nSize - i, (unsigned int)(1 + 4999999 / sizeof(T))); + v.resize_uninitialized(i + blk); + is.read(AsWritableBytes(Span{&v[i], blk})); + i += blk; + } + } else { + Unserialize(is, Using<VectorFormatter<DefaultFormatter>>(v)); } } -template<typename Stream, unsigned int N, typename T, typename V> -void Unserialize_impl(Stream& is, prevector<N, T>& v, const V&) -{ - Unserialize(is, Using<VectorFormatter<DefaultFormatter>>(v)); -} - -template<typename Stream, unsigned int N, typename T> -inline void Unserialize(Stream& is, prevector<N, T>& v) -{ - Unserialize_impl(is, v, T()); -} - - /** * vector |