diff options
author | Martin Leitner-Ankerl <martin.ankerl@gmail.com> | 2023-08-02 19:55:20 +0200 |
---|---|---|
committer | Martin Leitner-Ankerl <martin.ankerl@gmail.com> | 2023-08-03 10:35:22 +0200 |
commit | f054bd072afb72d8dae7adc521ce15c13b236700 (patch) | |
tree | 34ab01ab258c4dfc2b973d045ea9a1169a0a06e7 /src | |
parent | 088caa68fb8efd8624709d643913b8a7e1218f8a (diff) | |
download | bitcoin-f054bd072afb72d8dae7adc521ce15c13b236700.tar.xz |
refactor: use "if constexpr" in std::vector's Unserialize()
This gets rid of unnecessarily creating a temporary object T() to call
the right function.
Diffstat (limited to 'src')
-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 72672b459e..39f2c0f3ae 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -650,8 +650,6 @@ template<typename Stream, unsigned int N, typename T> inline void Unserialize(St * 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> void Unserialize_impl(Stream& is, std::vector<T, A>& v, const unsigned char&); -template<typename Stream, typename T, typename A, typename V> void Unserialize_impl(Stream& is, std::vector<T, A>& v, const V&); template<typename Stream, typename T, typename A> inline void Unserialize(Stream& is, std::vector<T, A>& v); /** @@ -801,35 +799,25 @@ void Serialize(Stream& os, const std::vector<T, A>& v) } -template<typename Stream, typename T, typename A> -void Unserialize_impl(Stream& is, std::vector<T, A>& v, const unsigned char&) +template <typename Stream, typename T, typename A> +void Unserialize(Stream& is, std::vector<T, A>& 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(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(i + blk); + is.read(AsWritableBytes(Span{&v[i], blk})); + i += blk; + } + } else { + Unserialize(is, Using<VectorFormatter<DefaultFormatter>>(v)); } } -template<typename Stream, typename T, typename A, typename V> -void Unserialize_impl(Stream& is, std::vector<T, A>& v, const V&) -{ - Unserialize(is, Using<VectorFormatter<DefaultFormatter>>(v)); -} - -template<typename Stream, typename T, typename A> -inline void Unserialize(Stream& is, std::vector<T, A>& v) -{ - Unserialize_impl(is, v, T()); -} - - /** * pair |