mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 04:52:59 +01:00
Merge #11432: Remove unused fTry from push_lock
92848e5
Remove unused fTry from push_lock (João Barbosa) Pull request description: After #9674 (618ee92
) the `fTry` argument in `push_lock` is no longer needed. Tree-SHA512: a461f2ca9e590a9dfcc7814d9852d85f03712cb4735176b8b2db0e8dc731597c2a515650998ca7d53cf5a0c48b408a974a0704897036c6ed74788fc24c5e73ae
This commit is contained in:
commit
058c0f996b
@ -98,7 +98,7 @@ static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch,
|
|||||||
assert(false);
|
assert(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
|
static void push_lock(void* c, const CLockLocation& locklocation)
|
||||||
{
|
{
|
||||||
if (lockstack.get() == nullptr)
|
if (lockstack.get() == nullptr)
|
||||||
lockstack.reset(new LockStack);
|
lockstack.reset(new LockStack);
|
||||||
@ -130,7 +130,7 @@ static void pop_lock()
|
|||||||
|
|
||||||
void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry)
|
void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry)
|
||||||
{
|
{
|
||||||
push_lock(cs, CLockLocation(pszName, pszFile, nLine, fTry), fTry);
|
push_lock(cs, CLockLocation(pszName, pszFile, nLine, fTry));
|
||||||
}
|
}
|
||||||
|
|
||||||
void LeaveCritical()
|
void LeaveCritical()
|
||||||
|
Loading…
Reference in New Issue
Block a user