diff options
| author | Wladimir J. van der Laan <[email protected]> | 2017-01-04 12:22:49 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2017-01-04 12:23:10 +0100 |
| commit | 869781c51cc1b6ee0a8635bcefbcbe11db7f5b25 (patch) | |
| tree | 9f566f00ccb67f888c6e5a8026215fed51169514 /src/primitives | |
| parent | Merge #9289: net: drop boost::thread_group (diff) | |
| parent | Remove unused MakeTransactionRef overloads (diff) | |
| download | discoin-869781c51cc1b6ee0a8635bcefbcbe11db7f5b25.tar.xz discoin-869781c51cc1b6ee0a8635bcefbcbe11db7f5b25.zip | |
Merge #9283: A few more CTransactionRef optimizations
91335ba Remove unused MakeTransactionRef overloads (Pieter Wuille)
6713f0f Make FillBlock consume txn_available to avoid shared_ptr copies (Pieter Wuille)
62607d7 Convert COrphanTx to keep a CTransactionRef (Pieter Wuille)
c44e4c4 Make AcceptToMemoryPool take CTransactionRef (Pieter Wuille)
Diffstat (limited to 'src/primitives')
| -rw-r--r-- | src/primitives/transaction.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index be3d7989a..af2986a41 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -453,8 +453,6 @@ struct CMutableTransaction typedef std::shared_ptr<const CTransaction> CTransactionRef; static inline CTransactionRef MakeTransactionRef() { return std::make_shared<const CTransaction>(); } template <typename Tx> static inline CTransactionRef MakeTransactionRef(Tx&& txIn) { return std::make_shared<const CTransaction>(std::forward<Tx>(txIn)); } -static inline CTransactionRef MakeTransactionRef(const CTransactionRef& txIn) { return txIn; } -static inline CTransactionRef MakeTransactionRef(CTransactionRef&& txIn) { return std::move(txIn); } /** Compute the weight of a transaction, as defined by BIP 141 */ int64_t GetTransactionWeight(const CTransaction &tx); |