LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #8658: Remove unused statements in serialization

Browse source 
64d9507 [WIP] Remove unused statement in serialization (Pavel Janík)
This commit is contained in:
Wladimir J. van der Laan 2016-09-29 15:00:19 +02:00
commit 9b94cca41f
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
5 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/addrdb.h
View file

@ -48,7 +48,6 @@ public:
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
READWRITE(this->nVersion); READWRITE(this->nVersion);
nVersion = this->nVersion;
READWRITE(nCreateTime); READWRITE(nCreateTime);
READWRITE(nBanUntil); READWRITE(nBanUntil);
READWRITE(banReason); READWRITE(banReason);

1
src/qt/recentrequeststablemodel.h
View file

@ -31,7 +31,6 @@ public:
unsigned int nDate = date.toTime_t(); unsigned int nDate = date.toTime_t();
READWRITE(this->nVersion); READWRITE(this->nVersion);
nVersion = this->nVersion;
READWRITE(id); READWRITE(id);
READWRITE(nDate); READWRITE(nDate);
READWRITE(recipient); READWRITE(recipient);

1
src/qt/walletmodel.h
View file

@ -75,7 +75,6 @@ public:
std::string sAuthenticatedMerchant = authenticatedMerchant.toStdString(); std::string sAuthenticatedMerchant = authenticatedMerchant.toStdString();
READWRITE(this->nVersion); READWRITE(this->nVersion);
nVersion = this->nVersion;
READWRITE(sAddress); READWRITE(sAddress);
READWRITE(sLabel); READWRITE(sLabel);
READWRITE(amount); READWRITE(amount);

1
src/wallet/wallet.h
View file

@ -197,7 +197,6 @@ public:
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
std::vector<uint256> vMerkleBranch; // For compatibility with older versions. std::vector<uint256> vMerkleBranch; // For compatibility with older versions.
READWRITE(*(CTransaction*)this); READWRITE(*(CTransaction*)this);
nVersion = this->nVersion;
READWRITE(hashBlock); READWRITE(hashBlock);
READWRITE(vMerkleBranch); READWRITE(vMerkleBranch);
READWRITE(nIndex); READWRITE(nIndex);

2
src/wallet/walletdb.h
View file

@ -57,7 +57,6 @@ public:
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
{ {
READWRITE(this->nVersion); READWRITE(this->nVersion);
nVersion = this->nVersion;
READWRITE(nExternalChainCounter); READWRITE(nExternalChainCounter);
READWRITE(masterKeyID); READWRITE(masterKeyID);
} }
@ -96,7 +95,6 @@ public:
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
READWRITE(this->nVersion); READWRITE(this->nVersion);
nVersion = this->nVersion;
READWRITE(nCreateTime); READWRITE(nCreateTime);
if (this->nVersion >= VERSION_WITH_HDDATA) if (this->nVersion >= VERSION_WITH_HDDATA)
{ {