refactor: Work around Werror=free-nonheap-object in AssumeCalculateMemPoolAncestors

MarcoFalke · MarcoFalke · commit faa86eeb418a · 2023-01-05T19:48:14.000+01:00
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -260,8 +260,8 @@ CTxMemPool::setEntries CTxMemPool::AssumeCalculateMemPoolAncestors(
     const Limits& limits,
     bool fSearchForParents /* = true */) const
 {
-    auto result{Assume(CalculateMemPoolAncestors(entry, limits, fSearchForParents))};
-    if (!result) {
+    auto result{CalculateMemPoolAncestors(entry, limits, fSearchForParents)};
+    if (!Assume(result)) {
         LogPrintLevel(BCLog::MEMPOOL, BCLog::Level::Error, "%s: CalculateMemPoolAncestors failed unexpectedly, continuing with empty ancestor set (%s)\n",
                       calling_fn_name, util::ErrorString(result).original);
     }

Original file line number	Diff line number	Diff line change
`@@ -260,8 +260,8 @@ CTxMemPool::setEntries CTxMemPool::AssumeCalculateMemPoolAncestors(`
`260`	`260`	`const Limits& limits,`
`261`	`261`	`bool fSearchForParents /* = true */) const`
`262`	`262`	`{`
`263`		`- auto result{Assume(CalculateMemPoolAncestors(entry, limits, fSearchForParents))};`
`264`		`- if (!result) {`
	`263`	`+ auto result{CalculateMemPoolAncestors(entry, limits, fSearchForParents)};`
	`264`	`+ if (!Assume(result)) {`
`265`	`265`	`LogPrintLevel(BCLog::MEMPOOL, BCLog::Level::Error, "%s: CalculateMemPoolAncestors failed unexpectedly, continuing with empty ancestor set (%s)\n",`
`266`	`266`	`calling_fn_name, util::ErrorString(result).original);`
`267`	`267`	`}`