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/crypter.h | |
| parent | 84881f8c472cc67dc757686eb7dc3b495b13cab8 (diff) | |
| download | bitcoin-31e9a8384a77947f6777d035992f4734618ed206.tar.xz | |
Use CSizeComputer to avoid counting sizes in SerializationOp
Diffstat (limited to 'src/crypter.h')
| -rw-r--r-- | src/crypter.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/crypter.h b/src/crypter.h index ce4c6315aa..b00f92721c 100644 --- a/src/crypter.h +++ b/src/crypter.h @@ -46,14 +46,12 @@ 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(vchCryptedKey); READWRITE(vchSalt); READWRITE(nDerivationMethod); READWRITE(nDeriveIterations); READWRITE(vchOtherDerivationParameters); - return nSerSize; } CMasterKey() |