diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-04 23:48:01 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-04 23:49:35 +0200 |
| commit | af9c3b0cffa4449f1254da3073aef77bafddf9cd (patch) | |
| tree | 7f76c41b2a5556b9836bde8691ee4af9c3030dae /src/qt | |
| parent | b4cd0975fbc93063473a4d9a09e2b2fe3c4ad489 (diff) | |
| parent | 1e4f87f5a13e34a457b537e9d13a212e6c5b754f (diff) | |
| download | bitcoin-af9c3b0cffa4449f1254da3073aef77bafddf9cd.tar.xz | |
Merge pull request #4838
1e4f87f Use memcmp for uint256 equality/inequality (Pieter Wuille)
8a41e1e Use boost::unordered_map for mapBlockIndex (Pieter Wuille)
145d5be Introduce BlockMap type for mapBlockIndex (Pieter Wuille)
a0dbe43 checkpoints.cpp depends on main, it can use mapBlockIndex directly (Pieter Wuille)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/transactionrecord.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index d7bd25e08b..20c1449c92 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -170,7 +170,7 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx) // Find the block the tx is in CBlockIndex* pindex = NULL; - std::map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(wtx.hashBlock); + BlockMap::iterator mi = mapBlockIndex.find(wtx.hashBlock); if (mi != mapBlockIndex.end()) pindex = (*mi).second; |