aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordonaloconnor <[email protected]>2017-09-07 19:13:01 +0100
committerdonaloconnor <[email protected]>2017-09-07 19:13:01 +0100
commit203a4aa31eee402755f7156593228ab55407cc47 (patch)
treed78a20dc5c1bdca2516485bd5f5cbf8bad1b0fbf /src
parentMerge #11156: Fix memory leaks in qt/guiutil.cpp (diff)
downloaddiscoin-203a4aa31eee402755f7156593228ab55407cc47.tar.xz
discoin-203a4aa31eee402755f7156593228ab55407cc47.zip
Fix CTxMemPoolEntry::UpdateAncestorState: modifySigOps param type int -> int64_t
Diffstat (limited to 'src')
-rw-r--r--src/txmempool.cpp2
-rw-r--r--src/txmempool.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index f68d67764..d5e3ad5c2 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -317,7 +317,7 @@ void CTxMemPoolEntry::UpdateDescendantState(int64_t modifySize, CAmount modifyFe
assert(int64_t(nCountWithDescendants) > 0);
}
-void CTxMemPoolEntry::UpdateAncestorState(int64_t modifySize, CAmount modifyFee, int64_t modifyCount, int modifySigOps)
+void CTxMemPoolEntry::UpdateAncestorState(int64_t modifySize, CAmount modifyFee, int64_t modifyCount, int64_t modifySigOps)
{
nSizeWithAncestors += modifySize;
assert(int64_t(nSizeWithAncestors) > 0);
diff --git a/src/txmempool.h b/src/txmempool.h
index b07886579..83850d8a3 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -109,7 +109,7 @@ public:
// Adjusts the descendant state.
void UpdateDescendantState(int64_t modifySize, CAmount modifyFee, int64_t modifyCount);
// Adjusts the ancestor state
- void UpdateAncestorState(int64_t modifySize, CAmount modifyFee, int64_t modifyCount, int modifySigOps);
+ void UpdateAncestorState(int64_t modifySize, CAmount modifyFee, int64_t modifyCount, int64_t modifySigOps);
// Updates the fee delta used for mining priority score, and the
// modified fees with descendants.
void UpdateFeeDelta(int64_t feeDelta);