[arch-commits] Commit in bitcoin (2 files)
Eli Schwartz
eschwartz at archlinux.org
Thu Jul 26 03:51:22 UTC 2018
Date: Thursday, July 26, 2018 @ 03:51:22
Author: eschwartz
Revision: 363453
Also rm dead patch
Deleted:
bitcoin/repos/community-staging-x86_64/0001-Make-boost-multi_index-comparators-const.patch
bitcoin/trunk/0001-Make-boost-multi_index-comparators-const.patch
------------------------------------------------------------------------------------+
repos/community-staging-x86_64/0001-Make-boost-multi_index-comparators-const.patch | 85 ----------
trunk/0001-Make-boost-multi_index-comparators-const.patch | 85 ----------
2 files changed, 170 deletions(-)
Deleted: repos/community-staging-x86_64/0001-Make-boost-multi_index-comparators-const.patch
===================================================================
--- repos/community-staging-x86_64/0001-Make-boost-multi_index-comparators-const.patch 2018-07-26 03:46:56 UTC (rev 363452)
+++ repos/community-staging-x86_64/0001-Make-boost-multi_index-comparators-const.patch 2018-07-26 03:51:22 UTC (rev 363453)
@@ -1,85 +0,0 @@
-From 1ec0c0a01c316146434642ab2f14a7367306dbec Mon Sep 17 00:00:00 2001
-From: Suhas Daftuar <sdaftuar at 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 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();
---
-2.15.1
-
Deleted: trunk/0001-Make-boost-multi_index-comparators-const.patch
===================================================================
--- trunk/0001-Make-boost-multi_index-comparators-const.patch 2018-07-26 03:46:56 UTC (rev 363452)
+++ trunk/0001-Make-boost-multi_index-comparators-const.patch 2018-07-26 03:51:22 UTC (rev 363453)
@@ -1,85 +0,0 @@
-From 1ec0c0a01c316146434642ab2f14a7367306dbec Mon Sep 17 00:00:00 2001
-From: Suhas Daftuar <sdaftuar at 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 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();
---
-2.15.1
-
More information about the arch-commits
mailing list