Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (0bd7ff702f3208cfca5ca8933e8f07388ec59021)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (0bd7ff702f3208cfca5ca8933e8f07388ec59021)
  • Date: Wed, 3 Jan 2018 22:32:38 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

net/bitcoin/HISTORY | 3 +
net/bitcoin/PRE_BUILD | 1
net/bitcoin/patches/boost-1_66.patch | 82
+++++++++++++++++++++++++++++++++++
3 files changed, 86 insertions(+)

New commits:
commit 0bd7ff702f3208cfca5ca8933e8f07388ec59021
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

bitcoin: Fix build against boost 1_66

diff --git a/net/bitcoin/HISTORY b/net/bitcoin/HISTORY
index 5f87db3..fea501c 100644
--- a/net/bitcoin/HISTORY
+++ b/net/bitcoin/HISTORY
@@ -1,3 +1,6 @@
+2018-01-03 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, patches/boost-1_66.patch: Fixed build against boost 1_66
+
2017-12-05 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* BUILD: fixed build against Qt 5
diff --git a/net/bitcoin/PRE_BUILD b/net/bitcoin/PRE_BUILD
index 5a7638b..cfe465c 100755
--- a/net/bitcoin/PRE_BUILD
+++ b/net/bitcoin/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches &&
./autogen.sh
diff --git a/net/bitcoin/patches/boost-1_66.patch
b/net/bitcoin/patches/boost-1_66.patch
new file mode 100644
index 0000000..be13d20
--- /dev/null
+++ b/net/bitcoin/patches/boost-1_66.patch
@@ -0,0 +1,82 @@
+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 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();



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (0bd7ff702f3208cfca5ca8933e8f07388ec59021), Ismael Luceno, 01/03/2018

Archive powered by MHonArc 2.6.24.

Top of Page