From 7b0992d9cd982f4e43ca1bd2c3eaf467e7600cab Mon Sep 17 00:00:00 2001 From: Greg Clayton Date: Thu, 18 Apr 2013 22:45:39 +0000 Subject: After discussing with Chris Lattner, we require C++11, so lets get rid of the macros and just use C++11. llvm-svn: 179805 --- lldb/source/Target/StackFrameList.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lldb/source/Target/StackFrameList.cpp') 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& 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); -- cgit v1.2.3