forked from pool/bitcoin
Dominique Leuenberger
ba27fb42e5
OBS-URL: https://build.opensuse.org/request/show/561276 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bitcoin?expand=0&rev=26
83 lines
3.5 KiB
Diff
83 lines
3.5 KiB
Diff
From 1ec0c0a01c316146434642ab2f14a7367306dbec Mon Sep 17 00:00:00 2001
|
|
From: Suhas Daftuar <sdaftuar@gmail.com>
|
|
Date: Thu, 7 Dec 2017 09:57:53 -0500
|
|
Subject: [PATCH] Make boost::multi_index comparators const
|
|
|
|
This fixes compatibility with boost 1.66
|
|
---
|
|
src/miner.h | 4 ++--
|
|
src/txmempool.h | 10 +++++-----
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/miner.h b/src/miner.h
|
|
index 36276dc362c5..d81ec6421cb8 100644
|
|
--- a/src/miner.h
|
|
+++ b/src/miner.h
|
|
@@ -71,7 +71,7 @@ struct modifiedentry_iter {
|
|
// except operating on CTxMemPoolModifiedEntry.
|
|
// TODO: refactor to avoid duplication of this logic.
|
|
struct CompareModifiedEntry {
|
|
- bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b)
|
|
+ bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) const
|
|
{
|
|
double f1 = (double)a.nModFeesWithAncestors * b.nSizeWithAncestors;
|
|
double f2 = (double)b.nModFeesWithAncestors * a.nSizeWithAncestors;
|
|
@@ -86,7 +86,7 @@ struct CompareModifiedEntry {
|
|
// This is sufficient to sort an ancestor package in an order that is valid
|
|
// to appear in a block.
|
|
struct CompareTxIterByAncestorCount {
|
|
- bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b)
|
|
+ bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) const
|
|
{
|
|
if (a->GetCountWithAncestors() != b->GetCountWithAncestors())
|
|
return a->GetCountWithAncestors() < b->GetCountWithAncestors();
|
|
diff --git a/src/txmempool.h b/src/txmempool.h
|
|
index 346585ab115e..86a008d7b211 100644
|
|
--- a/src/txmempool.h
|
|
+++ b/src/txmempool.h
|
|
@@ -204,7 +204,7 @@ struct mempoolentry_txid
|
|
class CompareTxMemPoolEntryByDescendantScore
|
|
{
|
|
public:
|
|
- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
|
|
+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
|
|
{
|
|
bool fUseADescendants = UseDescendantScore(a);
|
|
bool fUseBDescendants = UseDescendantScore(b);
|
|
@@ -226,7 +226,7 @@ class CompareTxMemPoolEntryByDescendantScore
|
|
}
|
|
|
|
// Calculate which score to use for an entry (avoiding division).
|
|
- bool UseDescendantScore(const CTxMemPoolEntry &a)
|
|
+ bool UseDescendantScore(const CTxMemPoolEntry &a) const
|
|
{
|
|
double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants();
|
|
double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize();
|
|
@@ -241,7 +241,7 @@ class CompareTxMemPoolEntryByDescendantScore
|
|
class CompareTxMemPoolEntryByScore
|
|
{
|
|
public:
|
|
- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
|
|
+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
|
|
{
|
|
double f1 = (double)a.GetModifiedFee() * b.GetTxSize();
|
|
double f2 = (double)b.GetModifiedFee() * a.GetTxSize();
|
|
@@ -255,7 +255,7 @@ class CompareTxMemPoolEntryByScore
|
|
class CompareTxMemPoolEntryByEntryTime
|
|
{
|
|
public:
|
|
- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
|
|
+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
|
|
{
|
|
return a.GetTime() < b.GetTime();
|
|
}
|
|
@@ -264,7 +264,7 @@ class CompareTxMemPoolEntryByEntryTime
|
|
class CompareTxMemPoolEntryByAncestorFee
|
|
{
|
|
public:
|
|
- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
|
|
+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
|
|
{
|
|
double aFees = a.GetModFeesWithAncestors();
|
|
double aSize = a.GetSizeWithAncestors();
|