Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Core][TReentrantRWLock] Add missing variable definition #6382

Merged
merged 1 commit into from
Sep 18, 2020
Merged

[Core][TReentrantRWLock] Add missing variable definition #6382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/thread/src/TReentrantRWLock.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ using namespace ROOT;
#define R__MAYBE_ASSERT_WITH_LOCAL_LOCK(where, msg, what) \
{ \
std::unique_lock<MutexT> lock(fMutex); \
auto local = fRecurseCounts.GetLocal(); \
if (!(what)) \
Error(where, "%s", msg); \
}
Expand Down Expand Up @@ -322,7 +323,7 @@ TReentrantRWLock<MutexT, RecurseCountsT>::Rewind(const State &earlierState) {
if (pStateDelta->fDeltaWriteRecurse != 0) {
R__MAYBE_ASSERT_WITH_LOCAL_LOCK("TReentrantRWLock::Rewind",
"Lock rewinded from a thread that does not own the Write lock",
fWriter && fRecurseCounts.IsNotCurrentWriter(local));
fWriter && fRecurseCounts.IsNotCurrentWriter(local)); // local defined in macro

// Claim a recurse-state +1 to be able to call Unlock() below.
fRecurseCounts.fWriteRecurse = typedState.fWriteRecurse + 1;
Expand Down