aboutsummaryrefslogtreecommitdiff
path: root/src/crypter.h
diff options
context:
space:
mode:
authorKamil Domanski <kdomanski@kdemail.net>2014-08-20 22:44:38 +0200
committerKamil Domanski <kdomanski@kdemail.net>2014-08-31 02:16:17 +0200
commit84881f8c472cc67dc757686eb7dc3b495b13cab8 (patch)
tree9aa2ae012cc4817464cb60e9d838fa92464a9477 /src/crypter.h
parent5d96b4ae0188fcad36105642c5d69249d37fdbb5 (diff)
rework overhauled serialization methods to non-static
Thanks to Pieter Wuille for most of the work on this commit. I did not fixup the overhaul commit, because a rebase conflicted with "remove fields of ser_streamplaceholder". I prefer not to risk making a mistake while resolving it.
Diffstat (limited to 'src/crypter.h')
-rw-r--r--src/crypter.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/crypter.h b/src/crypter.h
index c3f4ed971c..ce4c6315aa 100644
--- a/src/crypter.h
+++ b/src/crypter.h
@@ -43,16 +43,16 @@ public:
// such as the various parameters to scrypt
std::vector<unsigned char> vchOtherDerivationParameters;
- IMPLEMENT_SERIALIZE
+ IMPLEMENT_SERIALIZE;
- template <typename T, typename Stream, typename Operation>
- inline static size_t SerializationOp(T thisPtr, Stream& s, Operation ser_action, int nType, int nVersion) {
+ template <typename Stream, typename Operation>
+ inline size_t SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
size_t nSerSize = 0;
- READWRITE(thisPtr->vchCryptedKey);
- READWRITE(thisPtr->vchSalt);
- READWRITE(thisPtr->nDerivationMethod);
- READWRITE(thisPtr->nDeriveIterations);
- READWRITE(thisPtr->vchOtherDerivationParameters);
+ READWRITE(vchCryptedKey);
+ READWRITE(vchSalt);
+ READWRITE(nDerivationMethod);
+ READWRITE(nDeriveIterations);
+ READWRITE(vchOtherDerivationParameters);
return nSerSize;
}