commit bb19a13c0b3fe1ecdc1e46bbf2b06ffc1e25e04e
author Saleem Abdulrasool <compnerd@compnerd.org> Thu May 19 05:13:57 2016 +0000
committer Saleem Abdulrasool <compnerd@compnerd.org> Thu May 19 05:13:57 2016 +0000
tree a4383c7cf16b2a6b8e8aa1ff61435ceec0c6a7de
parent fe12d0e3e551a29b880ecfc7673810ce18567765

second pass over removal of Mutex and Condition

llvm-svn: 270024

lldb/source/Symbol/CompactUnwindInfo.cpp

diff --git a/lldb/source/Symbol/CompactUnwindInfo.cpp b/lldb/source/Symbol/CompactUnwindInfo.cpp
index 233ca91..564f038 100644
--- a/lldb/source/Symbol/CompactUnwindInfo.cpp
+++ b/lldb/source/Symbol/CompactUnwindInfo.cpp
@@ -130,19 +130,17 @@
 // constructor 
 //----------------------
 
-
-CompactUnwindInfo::CompactUnwindInfo(ObjectFile& objfile, SectionSP& section_sp) :
-    m_objfile (objfile),
-    m_section_sp (section_sp),
-    m_section_contents_if_encrypted (),
-    m_mutex (),
-    m_indexes (),
-    m_indexes_computed (eLazyBoolCalculate),
-    m_unwindinfo_data (),
-    m_unwindinfo_data_computed (false),
-    m_unwind_header ()
+CompactUnwindInfo::CompactUnwindInfo(ObjectFile &objfile, SectionSP &section_sp)
+    : m_objfile(objfile),
+      m_section_sp(section_sp),
+      m_section_contents_if_encrypted(),
+      m_mutex(),
+      m_indexes(),
+      m_indexes_computed(eLazyBoolCalculate),
+      m_unwindinfo_data(),
+      m_unwindinfo_data_computed(false),
+      m_unwind_header()
 {
-
 }
 
 //----------------------
@@ -223,7 +221,7 @@
 void
 CompactUnwindInfo::ScanIndex (const ProcessSP &process_sp)
 {
-    Mutex::Locker locker(m_mutex);
+    std::lock_guard<std::mutex> guard(m_mutex);
     if (m_indexes_computed == eLazyBoolYes && m_unwindinfo_data_computed)
         return;