From 497ca634e1a3ac943a7e0c12fdad06ac5822a55d Mon Sep 17 00:00:00 2001 From: Frederic Riss Date: Thu, 5 Mar 2015 05:29:05 +0000 Subject: [PATCH] Revert "[dsymutil] MSVC does generate move constructors, but it should accept to default them" This reverts commit r231350. It turns out MSVC doesn't generate implicit move constructors and also doesn't accept to default them... See for example http://lab.llvm.org:8011/builders/lldb-x86-windows-msvc/builds/2786 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231351 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/dsymutil/DwarfLinker.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/dsymutil/DwarfLinker.cpp b/tools/dsymutil/DwarfLinker.cpp index e54f6bc61c5..628643ce7b3 100644 --- a/tools/dsymutil/DwarfLinker.cpp +++ b/tools/dsymutil/DwarfLinker.cpp @@ -65,7 +65,10 @@ public: } // Workaround MSVC not supporting implicit move ops - CompileUnit(CompileUnit &&RHS) = default; + CompileUnit(CompileUnit &&RHS) + : OrigUnit(RHS.OrigUnit), Info(std::move(RHS.Info)), + CUDie(std::move(RHS.CUDie)), StartOffset(RHS.StartOffset), + NextUnitOffset(RHS.NextUnitOffset) {} DWARFUnit &getOrigUnit() const { return OrigUnit; } -- 2.34.1