mirror of
https://github.com/XRPLF/rippled.git
synced 2025-12-01 16:35:53 +00:00
Use standard C++ types instead of type aliases:
* Remove ripple::RippleMutex and ripple::RippleRecursiveMutex and use std::mutex and std::recursive_mutex respectively. * Use std::lock_guard instead of std::unique_lock when the additional features of std::unique_lock are not needed.
This commit is contained in:
committed by
Vinnie Falco
parent
333ba69d60
commit
f424ae6942
@@ -70,6 +70,7 @@
|
||||
#include <boost/optional.hpp>
|
||||
#include <tuple>
|
||||
#include <condition_variable>
|
||||
#include <mutex>
|
||||
|
||||
namespace ripple {
|
||||
|
||||
@@ -426,8 +427,7 @@ private:
|
||||
using subRpcMapType = hash_map<std::string, InfoSub::pointer>;
|
||||
|
||||
// XXX Split into more locks.
|
||||
using LockType = RippleRecursiveMutex;
|
||||
using ScopedLockType = std::lock_guard <LockType>;
|
||||
using ScopedLockType = std::lock_guard <std::recursive_mutex>;
|
||||
|
||||
Application& app_;
|
||||
clock_type& m_clock;
|
||||
@@ -435,7 +435,7 @@ private:
|
||||
|
||||
std::unique_ptr <LocalTxs> m_localTX;
|
||||
|
||||
LockType mSubLock;
|
||||
std::recursive_mutex mSubLock;
|
||||
|
||||
std::atomic<OperatingMode> mMode;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user