diff options
author | Jim Ingham <jingham@apple.com> | 2012-05-04 23:02:50 +0000 |
---|---|---|
committer | Jim Ingham <jingham@apple.com> | 2012-05-04 23:02:50 +0000 |
commit | 10ebffa48a592e2e03b2e8478b03ccdd0e8da2d5 (patch) | |
tree | 32f9eceb84a66b9b7f0387d5b89ba089d5bb4fe1 /lldb/source/Target/StackFrameList.cpp | |
parent | e326ed33a8135dca882a76128840a28c38a1e106 (diff) | |
download | bcm5719-llvm-10ebffa48a592e2e03b2e8478b03ccdd0e8da2d5.tar.gz bcm5719-llvm-10ebffa48a592e2e03b2e8478b03ccdd0e8da2d5.zip |
Don't expose the pthread_mutex_t underlying the Mutex & Mutex::Locker classes.
No one was using it and Locker(pthread_mutex_t *) immediately asserts for
pthread_mutex_t's that don't come from a Mutex anyway. Rather than try to make
that work, we should maintain the Mutex abstraction and not pass around the
platform implementation...
Make Mutex::Locker::Lock take a Mutex & or a Mutex *, and remove the constructor
taking a pthread_mutex_t *. You no longer need to call Mutex::GetMutex to pass
your mutex to a Locker (you can't in fact, since I made it private.)
llvm-svn: 156221
Diffstat (limited to 'lldb/source/Target/StackFrameList.cpp')
-rw-r--r-- | lldb/source/Target/StackFrameList.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Target/StackFrameList.cpp b/lldb/source/Target/StackFrameList.cpp index 3c580bca0d4..84fce4a6345 100644 --- a/lldb/source/Target/StackFrameList.cpp +++ b/lldb/source/Target/StackFrameList.cpp @@ -466,8 +466,8 @@ StackFrameList::InvalidateFrames (uint32_t start_idx) void StackFrameList::Merge (std::auto_ptr<StackFrameList>& curr_ap, lldb::StackFrameListSP& prev_sp) { - Mutex::Locker curr_locker (curr_ap.get() ? curr_ap->m_mutex.GetMutex() : NULL); - Mutex::Locker prev_locker (prev_sp.get() ? prev_sp->m_mutex.GetMutex() : NULL); + Mutex::Locker curr_locker (curr_ap.get() ? &curr_ap->m_mutex : NULL); + Mutex::Locker prev_locker (prev_sp.get() ? &prev_sp->m_mutex : NULL); #if defined (DEBUG_STACK_FRAMES) StreamFile s(stdout, false); |