Merge #11432: Remove unused fTry from push_lock

laanwj · laanwj · commit 058c0f996b72 · 2017-10-02T14:54:49.000+02:00
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
diff --git 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()

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ static void potential_deadlock_detected(const std::pair<void, void>& mismatch,`
`98`	`98`	`assert(false);`
`99`	`99`	`}`
`100`	`100`
`101`		`-static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)`
	`101`	`+static void push_lock(void* c, const CLockLocation& locklocation)`
`102`	`102`	`{`
`103`	`103`	`if (lockstack.get() == nullptr)`
`104`	`104`	`lockstack.reset(new LockStack);`
`@@ -130,7 +130,7 @@ static void pop_lock()`
`130`	`130`
`131`	`131`	`void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry)`
`132`	`132`	`{`
`133`		`- push_lock(cs, CLockLocation(pszName, pszFile, nLine, fTry), fTry);`
	`133`	`+ push_lock(cs, CLockLocation(pszName, pszFile, nLine, fTry));`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`void LeaveCritical()`