From 1cabbddbca615b26aa4510c75f459c28d6fe0afd Mon Sep 17 00:00:00 2001 From: Aaron Hook Date: Sun, 29 Dec 2019 13:04:02 -0800 Subject: refactor: Use uint16_t instead of unsigned short removed trailing whitespace to make linter happy --- src/serialize.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/serialize.h') diff --git a/src/serialize.h b/src/serialize.h index 71c2cfa164..7a94e704b2 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -9,13 +9,13 @@ #include #include +#include #include #include #include #include #include #include -#include #include #include #include @@ -272,7 +272,7 @@ template inline void Unserialize(Stream& s, bool& a) { char f=s inline unsigned int GetSizeOfCompactSize(uint64_t nSize) { if (nSize < 253) return sizeof(unsigned char); - else if (nSize <= std::numeric_limits::max()) return sizeof(unsigned char) + sizeof(unsigned short); + else if (nSize <= std::numeric_limits::max()) return sizeof(unsigned char) + sizeof(uint16_t); else if (nSize <= std::numeric_limits::max()) return sizeof(unsigned char) + sizeof(unsigned int); else return sizeof(unsigned char) + sizeof(uint64_t); } @@ -286,7 +286,7 @@ void WriteCompactSize(Stream& os, uint64_t nSize) { ser_writedata8(os, nSize); } - else if (nSize <= std::numeric_limits::max()) + else if (nSize <= std::numeric_limits::max()) { ser_writedata8(os, 253); ser_writedata16(os, nSize); -- cgit v1.2.3