mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-07-13 19:26:58 +02:00
refactor: use "if constexpr" in std::vector's Unserialize()
This gets rid of unnecessarily creating a temporary object T() to call the right function.
This commit is contained in:
@ -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.
|
* 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 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);
|
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>
|
template <typename Stream, typename T, typename A>
|
||||||
void Unserialize_impl(Stream& is, std::vector<T, A>& v, const unsigned char&)
|
void Unserialize(Stream& is, std::vector<T, A>& v)
|
||||||
{
|
{
|
||||||
// Limit size per read so bogus size value won't cause out of memory
|
if constexpr (std::is_same_v<T, unsigned char>) {
|
||||||
v.clear();
|
// Limit size per read so bogus size value won't cause out of memory
|
||||||
unsigned int nSize = ReadCompactSize(is);
|
v.clear();
|
||||||
unsigned int i = 0;
|
unsigned int nSize = ReadCompactSize(is);
|
||||||
while (i < nSize)
|
unsigned int i = 0;
|
||||||
{
|
while (i < nSize) {
|
||||||
unsigned int blk = std::min(nSize - i, (unsigned int)(1 + 4999999 / sizeof(T)));
|
unsigned int blk = std::min(nSize - i, (unsigned int)(1 + 4999999 / sizeof(T)));
|
||||||
v.resize(i + blk);
|
v.resize(i + blk);
|
||||||
is.read(AsWritableBytes(Span{&v[i], blk}));
|
is.read(AsWritableBytes(Span{&v[i], blk}));
|
||||||
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
|
* pair
|
||||||
|
Reference in New Issue
Block a user