mempool: remove stray boost::optional usage

kwvg · kwvg · commit 081d8db4d596 · 2024-03-25T11:55:06.000Z
diff --git a/src/txmempool.h b/src/txmempool.h
@@ -28,7 +28,6 @@
 #include <util/epochguard.h>
 #include <util/hasher.h>
 
-#include <boost/optional.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/ordered_index.hpp>
@@ -840,7 +839,7 @@ class CTxMemPool
         return m_epoch.visited(it->m_epoch_marker);
     }
 
-    bool visited(boost::optional<txiter> it) const EXCLUSIVE_LOCKS_REQUIRED(cs, m_epoch) {
+    bool visited(std::optional<txiter> it) const EXCLUSIVE_LOCKS_REQUIRED(cs, m_epoch) {
         assert(m_epoch.guarded());
         return !it || visited(*it);
     }
diff --git a/test/lint/lint-includes.sh b/test/lint/lint-includes.sh
@@ -58,7 +58,6 @@ EXPECTED_BOOST_INCLUDES=(
     boost/multi_index/ordered_index.hpp
     boost/multi_index/sequenced_index.hpp
     boost/multi_index_container.hpp
-    boost/optional.hpp
     boost/pool/pool_alloc.hpp
     boost/process.hpp
     boost/signals2/connection.hpp

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@`
`28`	`28`	`#include <util/epochguard.h>`
`29`	`29`	`#include <util/hasher.h>`
`30`	`30`
`31`		`-#include <boost/optional.hpp>`
`32`	`31`	`#include <boost/multi_index_container.hpp>`
`33`	`32`	`#include <boost/multi_index/hashed_index.hpp>`
`34`	`33`	`#include <boost/multi_index/ordered_index.hpp>`
`@@ -840,7 +839,7 @@ class CTxMemPool`
`840`	`839`	`return m_epoch.visited(it->m_epoch_marker);`
`841`	`840`	`}`
`842`	`841`
`843`		`- bool visited(boost::optional<txiter> it) const EXCLUSIVE_LOCKS_REQUIRED(cs, m_epoch) {`
	`842`	`+ bool visited(std::optional<txiter> it) const EXCLUSIVE_LOCKS_REQUIRED(cs, m_epoch) {`
`844`	`843`	`assert(m_epoch.guarded());`
`845`	`844`	`return !it \|\| visited(*it);`
`846`	`845`	`}`