aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-09-29 15:00:19 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-09-29 15:00:22 +0200
commit9b94cca41f3e7993ea74244276a68959cc937af9 (patch)
treef06bf287ddd9369ce540476cc56b3c27be62ca7d /src
parentcc9e8aca5f950c78dcfeff63c441ba993c1fe12f (diff)
parent64d9507ea5724634783cdaa290943292132086a9 (diff)
downloadbitcoin-9b94cca41f3e7993ea74244276a68959cc937af9.tar.xz
Merge #8658: Remove unused statements in serialization
64d9507 [WIP] Remove unused statement in serialization (Pavel Janík)
Diffstat (limited to 'src')
-rw-r--r--src/addrdb.h1
-rw-r--r--src/qt/recentrequeststablemodel.h1
-rw-r--r--src/qt/walletmodel.h1
-rw-r--r--src/wallet/wallet.h1
-rw-r--r--src/wallet/walletdb.h2
5 files changed, 0 insertions, 6 deletions
diff --git a/src/addrdb.h b/src/addrdb.h
index d8c66d872b..62835a6fb4 100644
--- a/src/addrdb.h
+++ b/src/addrdb.h
@@ -48,7 +48,6 @@ public:
template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
READWRITE(this->nVersion);
- nVersion = this->nVersion;
READWRITE(nCreateTime);
READWRITE(nBanUntil);
READWRITE(banReason);
diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h
index f3cf03f4e3..0193e748d7 100644
--- a/src/qt/recentrequeststablemodel.h
+++ b/src/qt/recentrequeststablemodel.h
@@ -31,7 +31,6 @@ public:
unsigned int nDate = date.toTime_t();
READWRITE(this->nVersion);
- nVersion = this->nVersion;
READWRITE(id);
READWRITE(nDate);
READWRITE(recipient);
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index e233fa690d..b105c6d991 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -75,7 +75,6 @@ public:
std::string sAuthenticatedMerchant = authenticatedMerchant.toStdString();
READWRITE(this->nVersion);
- nVersion = this->nVersion;
READWRITE(sAddress);
READWRITE(sLabel);
READWRITE(amount);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index f6c658928f..c700e0ca7c 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -197,7 +197,6 @@ public:
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
std::vector<uint256> vMerkleBranch; // For compatibility with older versions.
READWRITE(*(CTransaction*)this);
- nVersion = this->nVersion;
READWRITE(hashBlock);
READWRITE(vMerkleBranch);
READWRITE(nIndex);
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 5addd5c5c0..9c9d4922a4 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -57,7 +57,6 @@ public:
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
{
READWRITE(this->nVersion);
- nVersion = this->nVersion;
READWRITE(nExternalChainCounter);
READWRITE(masterKeyID);
}
@@ -96,7 +95,6 @@ public:
template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
READWRITE(this->nVersion);
- nVersion = this->nVersion;
READWRITE(nCreateTime);
if (this->nVersion >= VERSION_WITH_HDDATA)
{