From fb415dc6ac628525326208d0e485057dc00a677b Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 17 Apr 2012 05:03:21 -0700 Subject: [PATCH] Have a SHAMapItem use a serializer internally to save copies and avoid ugliness. --- src/SHAMap.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/SHAMap.h b/src/SHAMap.h index 4e90ddaa53..9cc20ff06d 100644 --- a/src/SHAMap.h +++ b/src/SHAMap.h @@ -91,7 +91,7 @@ public: private: uint256 mTag; - std::vector mData; + Serializer mData; public: @@ -102,11 +102,12 @@ public: // for account balances SHAMapItem(const uint160& tag, const std::vector& data); - const uint256& getTag() const { return mTag; } - std::vector getData() const { return mData; } - const std::vector& peekData() const { return mData; } - void addRaw(Serializer &s) { s.addRaw(mData); } - void addRaw(std::vector& s) { s.insert(s.end(), mData.begin(), mData.end()); } + const uint256& getTag() const { return mTag; } + std::vector getData() const { return mData.getData(); } + const std::vector& peekData() const { return mData.peekData(); } + Serializer& peekSerializer() { return mData; } + void addRaw(Serializer &s) { s.addRaw(mData); } + void addRaw(std::vector& s) { s.insert(s.end(), mData.begin(), mData.end()); } void updateData(const std::vector& data) { mData=data; }