sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1836 from lodgepole/feature/backport-11847

Browse Source 
[backport] Fixes compatibility with boost 1.66
This commit is contained in:
UdjinM6 2018-01-07 02:37:53 +03:00
parent fa5fc418a0
commit f71ab1daf6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/txmempool.h
View File

@ -204,7 +204,7 @@ struct mempoolentry_txid
class CompareTxMemPoolEntryByDescendantScore class CompareTxMemPoolEntryByDescendantScore
{ {
public: public:
bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
{ {
bool fUseADescendants = UseDescendantScore(a); bool fUseADescendants = UseDescendantScore(a);
bool fUseBDescendants = UseDescendantScore(b); bool fUseBDescendants = UseDescendantScore(b);
@ -226,7 +226,7 @@ public:
} }
// Calculate which score to use for an entry (avoiding division). // 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 f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants();
double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize(); double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize();
@ -241,7 +241,7 @@ public:
class CompareTxMemPoolEntryByScore class CompareTxMemPoolEntryByScore
{ {
public: 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 f1 = (double)a.GetModifiedFee() * b.GetTxSize();
double f2 = (double)b.GetModifiedFee() * a.GetTxSize(); double f2 = (double)b.GetModifiedFee() * a.GetTxSize();
@ -255,7 +255,7 @@ public:
class CompareTxMemPoolEntryByEntryTime class CompareTxMemPoolEntryByEntryTime
{ {
public: public:
bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
{ {
return a.GetTime() < b.GetTime(); return a.GetTime() < b.GetTime();
} }