diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-10-02 14:54:42 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-10-02 14:54:49 +0200 |
| commit | 058c0f996b72e7d4dc4ea80309fd1a430cddabb3 (patch) | |
| tree | 37124bb6fe1a8254113c2d5d35f7123df03559f2 | |
| parent | 557aba6ce7da8642ee6931ae37d33bfa25f3dfd0 (diff) | |
| parent | 92848e5058c7667c61c358ea2c46f07a6edc468b (diff) | |
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
| -rw-r--r-- | src/sync.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sync.cpp b/src/sync.cpp index 9c351ea487..87024ccdf2 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -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); @@ -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() |