[backport] Fixes compatibility with boost 1.66#1836
Merged
UdjinM6 merged 1 commit intodashpay:developfrom Jan 6, 2018
Merged
Conversation
UdjinM6
requested changes
Jan 6, 2018
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
Thanks!
Missing few changes from 11847 however - the patch should also update CompareTxMemPoolEntryByAncestorFee in txmempool.h and CompareModifiedEntry and CompareTxIterByAncestorCount in miner.h. Looks like switching the base branch didn't work well and this PR still uses some old commit as a base. Should rebase the branch on top of develop, reset it and reapply the (full) patch again. While doing so please do not recreate the patch manually, instead fetch upstream (bitcoin) repo and use git cherry-pick -m 1 4ef4dfe command.
lodgepole
force-pushed
the
feature/backport-11847
branch
3 times, most recently
from
decd8d9 to
9bcfb8c
Compare
1ec0c0a Make boost::multi_index comparators const (Suhas Daftuar) Pull request description: This fixes compatibility with boost 1.66. Fixes bitcoin#11837 Tree-SHA512: 3181336fcc159aa7ee70c843d76f2a063e4a401f427c218d7f856a3548ca70eaf8eee9d20abb73be259a5656273d3a65aa748e946e09cf656de5f50e6d4eb880
lodgepole
force-pushed
the
feature/backport-11847
branch
from
9bcfb8c to
8cfc257
Compare
Author
|
Thank you for your advice |
9 tasks
UdjinM6
added a commit
to UdjinM6/dash
that referenced
this pull request
Jan 7, 2018
[backport] Fixes compatibility with boost 1.66
NarubyRiverlione
added a commit
to NarubyRiverlione/spice
that referenced
this pull request
Feb 4, 2018
* 'spice' of github.com:NarubyRiverlione/spice: (8382 commits) updated testnet genessis spice images more rename genesis blocks ports magic message letters start letter addresses cleanup : * remove gitian signatures * remove seeds rename: more originale files rename Prepare 0.12.2.3 release notes (dashpay#1846) Avoid reference leakage in CKeyHolderStorage::AddKey (dashpay#1840) Protect CKeyHolderStorage via mutex (dashpay#1834) Skip existing masternode conections on mixing (dashpay#1833) Merge pull request dashpay#1836 from lodgepole/feature/backport-11847 Fix -liquidityprovider option (dashpay#1829) Vote on IS only if it was accepted to mempool (dashpay#1826) bump version to 0.12.2.3 (dashpay#1827) Merge bitcoin#8256: BUG: bitcoin-qt crash Swap iterations and fUseInstantSend parameters in ApproximateBestSubset (dashpay#1819) Fix crash on exit when -createwalletbackups=0 (dashpay#1810) Prepare v0.12.2.2 release notes (dashpay#1769) Force rcc to use resource format version 1. (dashpay#1784) ... # Conflicts: # contrib/gitian-descriptors/gitian-osx-signer.yml # contrib/gitian-descriptors/gitian-win-signer.yml # src/chainparams.cpp # src/qt/res/icons/bitcoin.icns # src/qt/res/icons/bitcoin.ico # src/qt/res/icons/bitcoin.png # src/qt/res/icons/crownium/about.png # src/qt/res/icons/drkblue/about.png # src/qt/res/icons/drkblue/bitcoin.png # src/qt/res/icons/light/about.png # src/qt/res/icons/light/remove.png # src/qt/res/icons/remove.png # src/qt/res/icons/trad/about.png # src/qt/res/icons/trad/remove.png
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Back port of bitcoin#11847
This fixes compatibility with boost 1.66