diff options
Diffstat (limited to 'src/netbase.h')
| -rw-r--r-- | src/netbase.h | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/netbase.h b/src/netbase.h index 2df3c4474d..6f8c132502 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -89,9 +89,13 @@ class CNetAddr friend bool operator<(const CNetAddr& a, const CNetAddr& b); IMPLEMENT_SERIALIZE - ( - READWRITE(FLATDATA(ip)); - ) + + 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(FLATDATA(thisPtr->ip)); + return nSerSize; + } }; class CSubNet @@ -149,14 +153,19 @@ class CService : public CNetAddr CService(const struct sockaddr_in6& addr); IMPLEMENT_SERIALIZE - ( - CService* pthis = const_cast<CService*>(this); - READWRITE(FLATDATA(ip)); - unsigned short portN = htons(port); - READWRITE(portN); - if (fRead) + + template <typename T, typename Stream, typename Operation> + inline static size_t SerializationOp(T thisPtr, Stream& s, Operation ser_action, int nType, int nVersion) { + bool fRead = boost::is_same<Operation, CSerActionUnserialize>(); + size_t nSerSize = 0; + CService* pthis = const_cast<CService*>(thisPtr); + READWRITE(FLATDATA(thisPtr->ip)); + unsigned short portN = htons(thisPtr->port); + READWRITE(portN); + if (fRead) pthis->port = ntohs(portN); - ) + return nSerSize; + } }; typedef CService proxyType; |