diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp index 99cdd226a..6d2df8df0 100644 --- a/src/interfaces/chain.cpp +++ b/src/interfaces/chain.cpp @@ -1,47 +1,45 @@ // Copyright (c) 2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include #include #include #include #include #include namespace interfaces { namespace { class LockImpl : public Chain::Lock {}; class LockingStateImpl : public LockImpl, public UniqueLock { using UniqueLock::UniqueLock; }; class ChainImpl : public Chain { public: std::unique_ptr lock(bool try_lock) override { auto result = std::make_unique( ::cs_main, "cs_main", __FILE__, __LINE__, try_lock); if (try_lock && result && !*result) { return {}; } - // std::move necessary on some compilers due to conversion from - // LockingStateImpl to Lock pointer - return std::move(result); + return result; } std::unique_ptr assumeLocked() override { return std::make_unique(); } }; } // namespace std::unique_ptr MakeChain() { return std::make_unique(); } } // namespace interfaces