aboutsummaryrefslogtreecommitdiff
path: root/src/bloom.h
diff options
context:
space:
mode:
authorKamil Domanski <kdomanski@kdemail.net>2014-08-20 08:42:31 +0200
committerKamil Domanski <kdomanski@kdemail.net>2014-08-31 02:14:20 +0200
commit3d796f89962842e91e7d88e57c1d2d579f01052e (patch)
treed4be736c23fbc4d453a1e4e281eafb4f51cdffd8 /src/bloom.h
parent9f3d47677973cb894fdbb437b9b322e2062a1bf1 (diff)
overhaul serialization code
The implementation of each class' serialization/deserialization is no longer passed within a macro. The implementation now lies within a template of form: template <typename T, typename Stream, typename Operation> inline static size_t SerializationOp(T thisPtr, Stream& s, Operation ser_action, int nType, int nVersion) { size_t nSerSize = 0; /* CODE */ return nSerSize; } In cases when codepath should depend on whether or not we are just deserializing (old fGetSize, fWrite, fRead flags) an additional clause can be used: bool fRead = boost::is_same<Operation, CSerActionUnserialize>(); The IMPLEMENT_SERIALIZE macro will now be a freestanding clause added within class' body (similiar to Qt's Q_OBJECT) to implement GetSerializeSize, Serialize and Unserialize. These are now wrappers around the "SerializationOp" template.
Diffstat (limited to 'src/bloom.h')
-rw-r--r--src/bloom.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/bloom.h b/src/bloom.h
index 54d16d7126..dafea67029 100644
--- a/src/bloom.h
+++ b/src/bloom.h
@@ -63,12 +63,16 @@ public:
CBloomFilter() : isFull(true), isEmpty(false), nHashFuncs(0), nTweak(0), nFlags(0) {}
IMPLEMENT_SERIALIZE
- (
- READWRITE(vData);
- READWRITE(nHashFuncs);
- READWRITE(nTweak);
- READWRITE(nFlags);
- )
+
+ template <typename T, typename Stream, typename Operation>
+ inline static size_t SerializationOp(T thisPtr, Stream& s, Operation ser_action, int nType, int nVersion) {
+ size_t nSerSize = 0;
+ READWRITE(thisPtr->vData);
+ READWRITE(thisPtr->nHashFuncs);
+ READWRITE(thisPtr->nTweak);
+ READWRITE(thisPtr->nFlags);
+ return nSerSize;
+ }
void insert(const std::vector<unsigned char>& vKey);
void insert(const COutPoint& outpoint);