diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-08-21 00:49:32 +0200 |
|---|---|---|
| committer | Kamil Domanski <kdomanski@kdemail.net> | 2014-08-31 02:18:42 +0200 |
| commit | 31e9a8384a77947f6777d035992f4734618ed206 (patch) | |
| tree | 9a055fbae630bad4b7982a5aae1294a9579382cb /src/alert.h | |
| parent | 84881f8c472cc67dc757686eb7dc3b495b13cab8 (diff) | |
| download | bitcoin-31e9a8384a77947f6777d035992f4734618ed206.tar.xz | |
Use CSizeComputer to avoid counting sizes in SerializationOp
Diffstat (limited to 'src/alert.h')
| -rw-r--r-- | src/alert.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/alert.h b/src/alert.h index 46ec4fbde0..b25ac41f6b 100644 --- a/src/alert.h +++ b/src/alert.h @@ -49,8 +49,7 @@ public: IMPLEMENT_SERIALIZE; template <typename Stream, typename Operation> - inline size_t SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { - size_t nSerSize = 0; + inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { READWRITE(this->nVersion); nVersion = this->nVersion; READWRITE(nRelayUntil); @@ -66,7 +65,6 @@ public: READWRITE(LIMITED_STRING(strComment, 65536)); READWRITE(LIMITED_STRING(strStatusBar, 256)); READWRITE(LIMITED_STRING(strReserved, 256)); - return nSerSize; } void SetNull(); @@ -89,11 +87,9 @@ public: IMPLEMENT_SERIALIZE; template <typename Stream, typename Operation> - inline size_t SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { - size_t nSerSize = 0; + inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { READWRITE(vchMsg); READWRITE(vchSig); - return nSerSize; } void SetNull(); |