diff options
| author | Pieter Wuille <pieter@wuille.net> | 2020-03-11 09:35:50 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter@wuille.net> | 2020-03-30 16:10:30 -0700 |
| commit | 4eb5643e3538863c9d2ff261f49a9a1b248de243 (patch) | |
| tree | 377437ffee20c67fa7e0611c31be6b2490a4483c /src/netaddress.h | |
| parent | 2b1f85e8c52c8bc5a17eae4c809eaf61d724af98 (diff) | |
| download | bitcoin-4eb5643e3538863c9d2ff261f49a9a1b248de243.tar.xz | |
Convert everything except wallet/qt to new serialization
Diffstat (limited to 'src/netaddress.h')
| -rw-r--r-- | src/netaddress.h | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/netaddress.h b/src/netaddress.h index 53d9c52a52..4beeb7f52e 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -99,12 +99,7 @@ class CNetAddr friend bool operator!=(const CNetAddr& a, const CNetAddr& b) { return !(a == b); } friend bool operator<(const CNetAddr& a, const CNetAddr& b); - ADD_SERIALIZE_METHODS; - - template <typename Stream, typename Operation> - inline void SerializationOp(Stream& s, Operation ser_action) { - READWRITE(ip); - } + SERIALIZE_METHODS(CNetAddr, obj) { READWRITE(obj.ip); } friend class CSubNet; }; @@ -136,14 +131,7 @@ class CSubNet friend bool operator!=(const CSubNet& a, const CSubNet& b) { return !(a == b); } friend bool operator<(const CSubNet& a, const CSubNet& b); - ADD_SERIALIZE_METHODS; - - template <typename Stream, typename Operation> - inline void SerializationOp(Stream& s, Operation ser_action) { - READWRITE(network); - READWRITE(netmask); - READWRITE(valid); - } + SERIALIZE_METHODS(CSubNet, obj) { READWRITE(obj.network, obj.netmask, obj.valid); } }; /** A combination of a network address (CNetAddr) and a (TCP) port */ @@ -171,13 +159,7 @@ class CService : public CNetAddr CService(const struct in6_addr& ipv6Addr, unsigned short port); explicit CService(const struct sockaddr_in6& addr); - ADD_SERIALIZE_METHODS; - - template <typename Stream, typename Operation> - inline void SerializationOp(Stream& s, Operation ser_action) { - READWRITE(ip); - READWRITE(Using<BigEndianFormatter<2>>(port)); - } + SERIALIZE_METHODS(CService, obj) { READWRITE(obj.ip, Using<BigEndianFormatter<2>>(obj.port)); } }; #endif // BITCOIN_NETADDRESS_H |