diff options
| author | Greg Clayton <gclayton@apple.com> | 2013-04-18 22:45:39 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2013-04-18 22:45:39 +0000 |
| commit | 7b0992d9cd982f4e43ca1bd2c3eaf467e7600cab (patch) | |
| tree | 662d44a97baffe8778f555b43203ad0257c71808 /lldb/source/Target/StackFrameList.cpp | |
| parent | 9f7a221fdcaf250db64b441558647384785cde5e (diff) | |
After discussing with Chris Lattner, we require C++11, so lets get rid of the macros and just use C++11.
llvm-svn: 179805
Diffstat (limited to 'lldb/source/Target/StackFrameList.cpp')
| -rw-r--r-- | lldb/source/Target/StackFrameList.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/source/Target/StackFrameList.cpp b/lldb/source/Target/StackFrameList.cpp index 41f57658e639..ef798cbb13ab 100644 --- a/lldb/source/Target/StackFrameList.cpp +++ b/lldb/source/Target/StackFrameList.cpp @@ -717,7 +717,7 @@ StackFrameList::InvalidateFrames (uint32_t start_idx) } void -StackFrameList::Merge (STD_UNIQUE_PTR(StackFrameList)& curr_ap, lldb::StackFrameListSP& prev_sp) +StackFrameList::Merge (std::unique_ptr<StackFrameList>& curr_ap, lldb::StackFrameListSP& prev_sp) { Mutex::Locker curr_locker (curr_ap.get() ? &curr_ap->m_mutex : NULL); Mutex::Locker prev_locker (prev_sp.get() ? &prev_sp->m_mutex : NULL); |