diff --git a/src/masternodes/anchors.h b/src/masternodes/anchors.h index 575e0a7bc26..713b0584259 100644 --- a/src/masternodes/anchors.h +++ b/src/masternodes/anchors.h @@ -14,9 +14,6 @@ #include #include -#include -#include - #include #include #include @@ -189,8 +186,8 @@ class CAnchorAuthIndex class CAnchorIndex { private: - boost::shared_ptr db; - boost::scoped_ptr batch; + std::shared_ptr db; + std::unique_ptr batch; public: using Signature = std::vector; using CTeam = CAnchorData::CTeam; @@ -275,7 +272,7 @@ class CAnchorIndex template bool IterateTable(char prefix, std::function callback) { - boost::scoped_ptr pcursor(const_cast(&*db)->NewIterator()); + std::unique_ptr pcursor(const_cast(&*db)->NewIterator()); pcursor->Seek(prefix); while (pcursor->Valid()) diff --git a/src/spv/spv_wrapper.h b/src/spv/spv_wrapper.h index 8bb0365092c..c9e85064780 100644 --- a/src/spv/spv_wrapper.h +++ b/src/spv/spv_wrapper.h @@ -18,9 +18,6 @@ #include #include -#include -#include - #include #include #include @@ -82,8 +79,8 @@ using namespace boost::multi_index; class CSpvWrapper { private: - boost::shared_ptr db; - boost::scoped_ptr batch; + std::shared_ptr db; + std::unique_ptr batch; BRPeerManager *manager = nullptr; std::string spv_internal_logfilename; @@ -202,7 +199,7 @@ class CSpvWrapper template bool IterateTable(char prefix, std::function callback) { - boost::scoped_ptr pcursor(const_cast(&*db)->NewIterator()); + std::unique_ptr pcursor(const_cast(&*db)->NewIterator()); pcursor->Seek(prefix); while (pcursor->Valid()) @@ -230,7 +227,7 @@ class CSpvWrapper template bool DeleteTable(char prefix) { - boost::scoped_ptr pcursor(const_cast(&*db)->NewIterator()); + std::unique_ptr pcursor(const_cast(&*db)->NewIterator()); pcursor->Seek(prefix); while (pcursor->Valid()) diff --git a/test/lint/lint-includes.sh b/test/lint/lint-includes.sh index d5bb57c2d85..328a4cbe02a 100755 --- a/test/lint/lint-includes.sh +++ b/test/lint/lint-includes.sh @@ -74,8 +74,6 @@ EXPECTED_BOOST_INCLUDES=( boost/preprocessor/cat.hpp boost/preprocessor/stringize.hpp boost/range/adaptor/transformed.hpp - boost/scoped_ptr.hpp - boost/shared_ptr.hpp boost/signals2/connection.hpp boost/signals2/last_value.hpp boost/signals2/signal.hpp