diff options
| -rw-r--r-- | src/serialize.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/serialize.h b/src/serialize.h index 19585c630a..a0b012b25c 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -710,14 +710,12 @@ template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_st /** * prevector - * 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> inline void Unserialize(Stream& is, prevector<N, T>& v); /** * vector - * vectors of unsigned char are a special case and are intended to be serialized as a single opaque blob. */ template<typename Stream, typename T, typename A> inline void Serialize(Stream& os, const std::vector<T, A>& v); template<typename Stream, typename T, typename A> inline void Unserialize(Stream& is, std::vector<T, A>& v); @@ -820,10 +818,9 @@ void Unserialize(Stream& is, std::basic_string<C>& str) template <typename Stream, unsigned int N, typename T> void Serialize(Stream& os, const prevector<N, T>& v) { - if constexpr (std::is_same_v<T, unsigned char>) { + if constexpr (BasicByte<T>) { // Use optimized version for unformatted basic bytes WriteCompactSize(os, v.size()); - if (!v.empty()) - os.write(MakeByteSpan(v)); + if (!v.empty()) os.write(MakeByteSpan(v)); } else { Serialize(os, Using<VectorFormatter<DefaultFormatter>>(v)); } @@ -833,7 +830,7 @@ void Serialize(Stream& os, const prevector<N, T>& v) template <typename Stream, unsigned int N, typename T> void Unserialize(Stream& is, prevector<N, T>& v) { - if constexpr (std::is_same_v<T, unsigned char>) { + if constexpr (BasicByte<T>) { // Use optimized version for unformatted basic bytes // Limit size per read so bogus size value won't cause out of memory v.clear(); unsigned int nSize = ReadCompactSize(is); @@ -856,10 +853,9 @@ void Unserialize(Stream& is, prevector<N, T>& v) template <typename Stream, typename T, typename A> void Serialize(Stream& os, const std::vector<T, A>& v) { - if constexpr (std::is_same_v<T, unsigned char>) { + if constexpr (BasicByte<T>) { // Use optimized version for unformatted basic bytes WriteCompactSize(os, v.size()); - if (!v.empty()) - os.write(MakeByteSpan(v)); + if (!v.empty()) os.write(MakeByteSpan(v)); } else if constexpr (std::is_same_v<T, bool>) { // A special case for std::vector<bool>, as dereferencing // std::vector<bool>::const_iterator does not result in a const bool& @@ -877,7 +873,7 @@ void Serialize(Stream& os, const std::vector<T, A>& v) template <typename Stream, typename T, typename A> void Unserialize(Stream& is, std::vector<T, A>& v) { - if constexpr (std::is_same_v<T, unsigned char>) { + if constexpr (BasicByte<T>) { // Use optimized version for unformatted basic bytes // Limit size per read so bogus size value won't cause out of memory v.clear(); unsigned int nSize = ReadCompactSize(is); |