[Lldb-commits] [lldb] r333996 - Fixup r333987

[Pavel Labath via lldb-commits]

Author: labath
Date: Tue Jun  5 02:56:14 2018
New Revision: 333996

URL: http://llvm.org/viewvc/llvm-project?rev=333996&view=rev
Log:
Fixup r333987

- add #include <atomic> (fixes windows build)
- remove std::move (fixes "using move prevents copy ellision" warnings)

Modified:
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFUnit.h

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp?rev=333996&r1=333995&r2=333996&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp Tue Jun  5 02:56:14 2018
@@ -104,11 +104,11 @@ DWARFUnit::ScopedExtractDIEs DWARFUnit::
   {
     llvm::sys::ScopedReader lock(m_die_array_mutex);
     if (!m_die_array.empty())
-      return std::move(scoped); // Already parsed
+      return scoped; // Already parsed
   }
   llvm::sys::ScopedWriter lock(m_die_array_mutex);
   if (!m_die_array.empty())
-    return std::move(scoped); // Already parsed
+    return scoped; // Already parsed
 
   // Otherwise m_die_array would be already populated.
   lldbassert(!m_cancel_scopes);

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFUnit.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFUnit.h?rev=333996&r1=333995&r2=333996&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFUnit.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFUnit.h Tue Jun  5 02:56:14 2018
@@ -14,6 +14,7 @@
 #include "DWARFDebugInfoEntry.h"
 #include "lldb/lldb-enumerations.h"
 #include "llvm/Support/RWMutex.h"
+#include <atomic>
 
 class DWARFUnit;
 class DWARFCompileUnit;