diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-01 21:00:32 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-01 21:23:01 +0200 |
| commit | 2e731f24b5a5c894e013a6d752f1cd409303e916 (patch) | |
| tree | 94ba6f1e3ab9ecb5ac1696b48b1aabc859aa8365 /src/alert.h | |
| parent | f6a81050372810d8eebc15523bde28e91d045314 (diff) | |
| parent | 31e9a8384a77947f6777d035992f4734618ed206 (diff) | |
| download | bitcoin-2e731f24b5a5c894e013a6d752f1cd409303e916.tar.xz | |
Merge pull request #4737
31e9a83 Use CSizeComputer to avoid counting sizes in SerializationOp (Pieter Wuille)
84881f8 rework overhauled serialization methods to non-static (Kamil Domanski)
5d96b4a remove fields of ser_streamplaceholder (Kamil Domanski)
3d796f8 overhaul serialization code (Kamil Domanski)
Diffstat (limited to 'src/alert.h')
| -rw-r--r-- | src/alert.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/alert.h b/src/alert.h index d8254ba2cb..4a8736d60b 100644 --- a/src/alert.h +++ b/src/alert.h @@ -46,8 +46,10 @@ public: std::string strStatusBar; std::string strReserved; - IMPLEMENT_SERIALIZE - ( + IMPLEMENT_SERIALIZE; + + template <typename Stream, typename Operation> + inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { READWRITE(this->nVersion); nVersion = this->nVersion; READWRITE(nRelayUntil); @@ -63,7 +65,7 @@ public: READWRITE(LIMITED_STRING(strComment, 65536)); READWRITE(LIMITED_STRING(strStatusBar, 256)); READWRITE(LIMITED_STRING(strReserved, 256)); - ) + } void SetNull(); @@ -82,11 +84,13 @@ public: SetNull(); } - IMPLEMENT_SERIALIZE - ( + IMPLEMENT_SERIALIZE; + + template <typename Stream, typename Operation> + inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { READWRITE(vchMsg); READWRITE(vchSig); - ) + } void SetNull(); bool IsNull() const; |