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.
This commit is contained in:
48
src/alert.h
48
src/alert.h
@@ -47,23 +47,27 @@ public:
|
||||
std::string strReserved;
|
||||
|
||||
IMPLEMENT_SERIALIZE
|
||||
(
|
||||
READWRITE(this->nVersion);
|
||||
nVersion = this->nVersion;
|
||||
READWRITE(nRelayUntil);
|
||||
READWRITE(nExpiration);
|
||||
READWRITE(nID);
|
||||
READWRITE(nCancel);
|
||||
READWRITE(setCancel);
|
||||
READWRITE(nMinVer);
|
||||
READWRITE(nMaxVer);
|
||||
READWRITE(setSubVer);
|
||||
READWRITE(nPriority);
|
||||
|
||||
READWRITE(LIMITED_STRING(strComment, 65536));
|
||||
READWRITE(LIMITED_STRING(strStatusBar, 256));
|
||||
READWRITE(LIMITED_STRING(strReserved, 256));
|
||||
)
|
||||
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->nVersion);
|
||||
nVersion = thisPtr->nVersion;
|
||||
READWRITE(thisPtr->nRelayUntil);
|
||||
READWRITE(thisPtr->nExpiration);
|
||||
READWRITE(thisPtr->nID);
|
||||
READWRITE(thisPtr->nCancel);
|
||||
READWRITE(thisPtr->setCancel);
|
||||
READWRITE(thisPtr->nMinVer);
|
||||
READWRITE(thisPtr->nMaxVer);
|
||||
READWRITE(thisPtr->setSubVer);
|
||||
READWRITE(thisPtr->nPriority);
|
||||
|
||||
READWRITE(LIMITED_STRING(thisPtr->strComment, 65536));
|
||||
READWRITE(LIMITED_STRING(thisPtr->strStatusBar, 256));
|
||||
READWRITE(LIMITED_STRING(thisPtr->strReserved, 256));
|
||||
return nSerSize;
|
||||
}
|
||||
|
||||
void SetNull();
|
||||
|
||||
@@ -83,10 +87,14 @@ public:
|
||||
}
|
||||
|
||||
IMPLEMENT_SERIALIZE
|
||||
(
|
||||
READWRITE(vchMsg);
|
||||
READWRITE(vchSig);
|
||||
)
|
||||
|
||||
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->vchMsg);
|
||||
READWRITE(thisPtr->vchSig);
|
||||
return nSerSize;
|
||||
}
|
||||
|
||||
void SetNull();
|
||||
bool IsNull() const;
|
||||
|
||||
Reference in New Issue
Block a user