highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-13 15:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

rework overhauled serialization methods to non-static

Browse Source 
Thanks to Pieter Wuille for most of the work on this commit.
I did not fixup the overhaul commit, because a rebase conflicted
with "remove fields of ser_streamplaceholder".
I prefer not to risk making a mistake while resolving it.
This commit is contained in:
Kamil Domanski
2014-08-20 22:44:38 +02:00
parent 5d96b4ae01
commit 84881f8c47
13 changed files with 269 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/bloom.h
View File

@@ -62,15 +62,15 @@ public:
CBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweak, unsigned char nFlagsIn);
CBloomFilter() : isFull(true), isEmpty(false), nHashFuncs(0), nTweak(0), nFlags(0) {}
IMPLEMENT_SERIALIZE
IMPLEMENT_SERIALIZE;
template <typename T, typename Stream, typename Operation>
inline static size_t SerializationOp(T thisPtr, Stream& s, Operation ser_action, int nType, int nVersion) {
template <typename Stream, typename Operation>
inline size_t SerializationOp(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);
READWRITE(vData);
READWRITE(nHashFuncs);
READWRITE(nTweak);
READWRITE(nFlags);
return nSerSize;
}