diff --git a/src/Serializer.cpp b/src/Serializer.cpp index cae1962967..09536bb557 100644 --- a/src/Serializer.cpp +++ b/src/Serializer.cpp @@ -508,7 +508,7 @@ void Serializer::TestSerializer() int SerializerIterator::getBytesLeft() { - return mSerializer.getLength()-mPos; + return mSerializer.size() - mPos; } unsigned char SerializerIterator::get8() diff --git a/src/Serializer.h b/src/Serializer.h index e747a4fd57..f21940cf8a 100644 --- a/src/Serializer.h +++ b/src/Serializer.h @@ -21,7 +21,7 @@ protected: std::vector mData; public: - Serializer(int n=256) { mData.reserve(n); } + Serializer(int n = 256) { mData.reserve(n); } Serializer(const std::vector &data) : mData(data) { ; } Serializer(const std::string& data) : mData(data.data(), (data.data()) + data.size()) { ; } @@ -72,23 +72,29 @@ public: static uint256 getSHA512Half(const std::string& strData); // totality functions - int getLength() const { return mData.size(); } - const void* getDataPtr() const { return &mData.front(); } - void* getDataPtr() { return &mData.front(); } + int getCapacity() const { return mData.capacity(); } + int getDataLength() const { return mData.size(); } + const void* getDataPtr() const { return &mData.front(); } + void* getDataPtr() { return &mData.front(); } + int getLength() { return mData.size(); } const std::vector& peekData() const { return mData; } std::vector getData() const { return mData; } - std::string getString() const { return std::string(static_cast(getDataPtr()), getLength()); } + std::string getString() const { return std::string(static_cast(getDataPtr()), size()); } void secureErase() { memset(&(mData.front()), 0, mData.size()); erase(); } void erase() { mData.clear(); } int removeLastByte(); bool chop(int num); // vector-like functions - std::vector::iterator begin() { return mData.begin(); } - std::vector::iterator end() { return mData.end(); } + std::vector::iterator begin() { return mData.begin(); } + std::vector::iterator end() { return mData.end(); } std::vector::const_iterator begin() const { return mData.begin(); } - std::vector::const_iterator end() const { return mData.end(); } - std::vector::size_type size() const { return mData.size(); } + std::vector::const_iterator end() const { return mData.end(); } + std::vector::size_type size() const { return mData.size(); } + void reserve(size_t n) { mData.reserve(n); } + void resize(size_t n) { mData.resize(n); } + size_t capacity() const { return mData.capacity(); } + bool operator==(const std::vector& v) { return v == mData; } bool operator!=(const std::vector& v) { return v != mData; }