diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/bench/prevector.cpp | 2 | ||||
-rw-r--r-- | src/streams.h | 38 |
2 files changed, 19 insertions, 21 deletions
diff --git a/src/bench/prevector.cpp b/src/bench/prevector.cpp index a2dbefa54a..924b6c0f5a 100644 --- a/src/bench/prevector.cpp +++ b/src/bench/prevector.cpp @@ -84,7 +84,7 @@ static void PrevectorDeserialize(benchmark::Bench& bench) for (auto x = 0; x < 1000; ++x) { s0 >> t1; } - s0.Init(SER_NETWORK, 0); + s0.Rewind(); }); } diff --git a/src/streams.h b/src/streams.h index 4b34cbfd86..a6e781b95b 100644 --- a/src/streams.h +++ b/src/streams.h @@ -14,6 +14,7 @@ #include <assert.h> #include <ios> #include <limits> +#include <optional> #include <stdint.h> #include <stdio.h> #include <string.h> @@ -205,12 +206,12 @@ class CDataStream protected: using vector_type = SerializeData; vector_type vch; - unsigned int nReadPos; + unsigned int nReadPos{0}; int nType; int nVersion; -public: +public: typedef vector_type::allocator_type allocator_type; typedef vector_type::size_type size_type; typedef vector_type::difference_type difference_type; @@ -222,30 +223,22 @@ public: typedef vector_type::reverse_iterator reverse_iterator; explicit CDataStream(int nTypeIn, int nVersionIn) - { - Init(nTypeIn, nVersionIn); - } + : nType{nTypeIn}, + nVersion{nVersionIn} {} explicit CDataStream(Span<const uint8_t> sp, int nTypeIn, int nVersionIn) - : vch(sp.data(), sp.data() + sp.size()) - { - Init(nTypeIn, nVersionIn); - } + : vch(sp.data(), sp.data() + sp.size()), + nType{nTypeIn}, + nVersion{nVersionIn} {} template <typename... Args> CDataStream(int nTypeIn, int nVersionIn, Args&&... args) + : nType{nTypeIn}, + nVersion{nVersionIn} { - Init(nTypeIn, nVersionIn); ::SerializeMany(*this, std::forward<Args>(args)...); } - void Init(int nTypeIn, int nVersionIn) - { - nReadPos = 0; - nType = nTypeIn; - nVersion = nVersionIn; - } - std::string str() const { return (std::string(begin(), end())); @@ -342,12 +335,17 @@ public: nReadPos = 0; } - bool Rewind(size_type n) + bool Rewind(std::optional<size_type> n = std::nullopt) { + // Total rewind if no size is passed + if (!n) { + nReadPos = 0; + return true; + } // Rewind by n characters if the buffer hasn't been compacted yet - if (n > nReadPos) + if (*n > nReadPos) return false; - nReadPos -= n; + nReadPos -= *n; return true; } |