diff options
| author | Bernhard J. M. Gruen <bernhard.gruen@googlemail.com> | 2018-03-04 18:17:07 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-28 13:11:26 +0000 |
| commit | d048d9804f8f0c166e5819ada04ca626b2f2f1bc (patch) | |
| tree | 2da20588adf038a6e5bb0fe8bf33c971fd04dde7 /community/namecoin/boost_1.66.0-compat.patch | |
| parent | 671894d0401ce1efcab0bd5214d2064822038843 (diff) | |
| download | aports-d048d9804f8f0c166e5819ada04ca626b2f2f1bc.tar.bz2 aports-d048d9804f8f0c166e5819ada04ca626b2f2f1bc.tar.xz | |
community/namecoin: patched to build with boost 1.66.0
Diffstat (limited to 'community/namecoin/boost_1.66.0-compat.patch')
| -rw-r--r-- | community/namecoin/boost_1.66.0-compat.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/community/namecoin/boost_1.66.0-compat.patch b/community/namecoin/boost_1.66.0-compat.patch new file mode 100644 index 0000000000..d5767b8288 --- /dev/null +++ b/community/namecoin/boost_1.66.0-compat.patch @@ -0,0 +1,72 @@ +diff --git a/src/miner.h b/src/miner.h +index 36276dc36..d81ec6421 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 346585ab1..86a008d7b 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 @@ public: + } + + // 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 @@ public: + 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 @@ public: + 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 @@ public: + 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(); +-- |