From e32e2e237e7e46e36225a976d137d83d5763559a Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Mon, 28 Aug 2017 09:43:39 +0200 Subject: [PATCH] Merge #11161: Remove redundant explicitly defined copy ctors b426e24 Remove redundant explicitly defined copy ctors (Dan Raviv) Pull request description: CFeeRate and CTxMemPoolEntry have explicitly defined copy ctors which has the same functionality as the implicit default copy ctors which would have been generated otherwise. Besides being redundant, it violates the rule of three (see https://en.wikipedia.org/wiki/Rule_of_three_(C%2B%2B_programming) ). (Of course, the rule of three doesn't -really- cause a resource management issue here, but the reason for that is exactly that there is no need for an explicit copy ctor in the first place since no resources are being managed). Tree-SHA512: c9294ebf5d955d230b44c6f0d20822975d44a34471a717d656f8b17181bcd2827f47ba897edf5accd650f5998c58aadc8ab3c91a3f556f1f6de36830ed4069ce --- src/policy/feerate.h | 1 - src/txmempool.cpp | 5 ----- src/txmempool.h | 2 -- 3 files changed, 8 deletions(-) diff --git a/src/policy/feerate.h b/src/policy/feerate.h index 565da6c1541e9d..7e519e3efaab39 100644 --- a/src/policy/feerate.h +++ b/src/policy/feerate.h @@ -26,7 +26,6 @@ class CFeeRate explicit CFeeRate(const CAmount& _nSatoshisPerK): nSatoshisPerK(_nSatoshisPerK) { } /** Constructor for a fee rate in satoshis per kB. The size in bytes must not exceed (2^63 - 1)*/ CFeeRate(const CAmount& nFeePaid, size_t nBytes); - CFeeRate(const CFeeRate& other) { nSatoshisPerK = other.nSatoshisPerK; } /** * Return the fee in satoshis for the given size in bytes. */ diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 55590b4cd08162..9b4f1ee0b48e3f 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -46,11 +46,6 @@ CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFe nSigOpCountWithAncestors = sigOpCount; } -CTxMemPoolEntry::CTxMemPoolEntry(const CTxMemPoolEntry& other) -{ - *this = other; -} - void CTxMemPoolEntry::UpdateFeeDelta(int64_t newFeeDelta) { nModFeesWithDescendants += newFeeDelta - feeDelta; diff --git a/src/txmempool.h b/src/txmempool.h index f501c02db696ee..90048b8b7127a7 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -100,8 +100,6 @@ class CTxMemPoolEntry bool spendsCoinbase, unsigned int nSigOps, LockPoints lp); - CTxMemPoolEntry(const CTxMemPoolEntry& other); - const CTransaction& GetTx() const { return *this->tx; } CTransactionRef GetSharedTx() const { return this->tx; } const CAmount& GetFee() const { return nFee; }