diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-05-18 10:59:00 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-05-18 11:01:42 +0200 |
| commit | 5e374f73060d32c7c3700cb521095ee2dc425d9c (patch) | |
| tree | 815afcedd6e2b38979aefd7e3c230a5f4f5938c3 /src/txmempool.h | |
| parent | 5c3f8ddcaa1164079105c452429fccf8127b01b6 (diff) | |
| parent | a68ec21f7ed2978d8945a0f4cfd7e80bfa5fd917 (diff) | |
| download | bitcoin-5e374f73060d32c7c3700cb521095ee2dc425d9c.tar.xz | |
Merge #8020: Use SipHash-2-4 for various non-cryptographic hashes
a68ec21 Use SipHash-2-4 for address relay selection (Pieter Wuille)
8cc9cfe Switch CTxMempool::mapTx to use a hash index for txids (Pieter Wuille)
382c871 Use SipHash-2-4 for CCoinsCache index (Pieter Wuille)
0b1295b Add SipHash-2-4 primitives to hash (Pieter Wuille)
Diffstat (limited to 'src/txmempool.h')
| -rw-r--r-- | src/txmempool.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/txmempool.h b/src/txmempool.h index bca8dd9791..3e1d387975 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -17,6 +17,7 @@ #undef foreach #include "boost/multi_index_container.hpp" #include "boost/multi_index/ordered_index.hpp" +#include "boost/multi_index/hashed_index.hpp" class CAutoFile; class CBlockIndex; @@ -422,7 +423,7 @@ public: CTxMemPoolEntry, boost::multi_index::indexed_by< // sorted by txid - boost::multi_index::ordered_unique<mempoolentry_txid>, + boost::multi_index::hashed_unique<mempoolentry_txid, SaltedTxidHasher>, // sorted by fee rate boost::multi_index::ordered_non_unique< boost::multi_index::tag<descendant_score>, |