From fa56c79df91e5d87533af38b64f4f4148a48a276 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 2 Feb 2022 18:34:30 +0100 Subject: Make CDataStream work properly on 64-bit systems --- src/streams.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/streams.h') diff --git a/src/streams.h b/src/streams.h index e485c09457..3ffdb50c76 100644 --- a/src/streams.h +++ b/src/streams.h @@ -187,7 +187,7 @@ class CDataStream protected: using vector_type = SerializeData; vector_type vch; - unsigned int nReadPos{0}; + vector_type::size_type nReadPos{0}; int nType; int nVersion; @@ -282,7 +282,7 @@ public: if (dst.size() == 0) return; // Read from the beginning of the buffer - auto next_read_pos{CheckedAdd(nReadPos, dst.size())}; + auto next_read_pos{CheckedAdd(nReadPos, dst.size())}; if (!next_read_pos.has_value() || next_read_pos.value() > vch.size()) { throw std::ios_base::failure("CDataStream::read(): end of data"); } @@ -298,7 +298,7 @@ public: void ignore(size_t num_ignore) { // Ignore from the beginning of the buffer - auto next_read_pos{CheckedAdd(nReadPos, num_ignore)}; + auto next_read_pos{CheckedAdd(nReadPos, num_ignore)}; if (!next_read_pos.has_value() || next_read_pos.value() > vch.size()) { throw std::ios_base::failure("CDataStream::ignore(): end of data"); } -- cgit v1.2.3