Skip to content

Commit

Permalink
Merge #11432: Remove unused fTry from push_lock
Browse files Browse the repository at this point in the history
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
  • Loading branch information
laanwj committed Oct 2, 2017
2 parents 557aba6 + 92848e5 commit 058c0f9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/sync.cpp
Expand Up @@ -98,7 +98,7 @@ static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch,
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)
lockstack.reset(new LockStack);
Expand Down Expand Up @@ -130,7 +130,7 @@ static void pop_lock()

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()
Expand Down

0 comments on commit 058c0f9

Please sign in to comment.