diff options
| author | practicalswift <[email protected]> | 2018-06-10 11:01:20 +0200 |
|---|---|---|
| committer | practicalswift <[email protected]> | 2018-06-10 11:01:20 +0200 |
| commit | a426098572884349a3d9081187eaeb999f6e2c5a (patch) | |
| tree | d862214e4a5c6c919c6ffe8ae5429bdd44b521c8 | |
| parent | Merge #12924: Fix hdmaster-key / seed-key confusion (scripted diff) (diff) | |
| download | discoin-a426098572884349a3d9081187eaeb999f6e2c5a.tar.xz discoin-a426098572884349a3d9081187eaeb999f6e2c5a.zip | |
Fix compiler warnings emitted when compiling under stock OpenBSD 6.3
| -rw-r--r-- | src/txmempool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index bb585fc07..6f1fd8ce6 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -693,18 +693,18 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const // Check children against mapNextTx CTxMemPool::setEntries setChildrenCheck; auto iter = mapNextTx.lower_bound(COutPoint(it->GetTx().GetHash(), 0)); - int64_t childSizes = 0; + uint64_t child_sizes = 0; for (; iter != mapNextTx.end() && iter->first->hash == it->GetTx().GetHash(); ++iter) { txiter childit = mapTx.find(iter->second->GetHash()); assert(childit != mapTx.end()); // mapNextTx points to in-mempool transactions if (setChildrenCheck.insert(childit).second) { - childSizes += childit->GetTxSize(); + child_sizes += childit->GetTxSize(); } } assert(setChildrenCheck == GetMemPoolChildren(it)); // Also check to make sure size is greater than sum with immediate children. // just a sanity check, not definitive that this calc is correct... - assert(it->GetSizeWithDescendants() >= childSizes + it->GetTxSize()); + assert(it->GetSizeWithDescendants() >= child_sizes + it->GetTxSize()); if (fDependsWait) waitingOnDependants.push_back(&(*it)); |