From 0eae9eccdf5dbd016fece11e03f564b8f1b1fbfb Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Thu, 27 Oct 2016 15:23:44 +0000 Subject: [PATCH] Remove duplicated default move ctors/move assign. No functional change. llvm-svn: 285302 --- llvm/tools/dsymutil/DebugMap.h | 15 ++------------- llvm/tools/llvm-cov/SourceCoverageView.h | 9 --------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/llvm/tools/dsymutil/DebugMap.h b/llvm/tools/dsymutil/DebugMap.h index 639f503..48828939 100644 --- a/llvm/tools/dsymutil/DebugMap.h +++ b/llvm/tools/dsymutil/DebugMap.h @@ -176,19 +176,8 @@ private: DebugMapObject() = default; public: - DebugMapObject &operator=(DebugMapObject RHS) { - std::swap(Filename, RHS.Filename); - std::swap(Timestamp, RHS.Timestamp); - std::swap(Symbols, RHS.Symbols); - std::swap(AddressToMapping, RHS.AddressToMapping); - return *this; - } - DebugMapObject(DebugMapObject &&RHS) { - Filename = std::move(RHS.Filename); - Timestamp = std::move(RHS.Timestamp); - Symbols = std::move(RHS.Symbols); - AddressToMapping = std::move(RHS.AddressToMapping); - } + DebugMapObject(DebugMapObject &&) = default; + DebugMapObject &operator=(DebugMapObject &&) = default; ///@} }; } diff --git a/llvm/tools/llvm-cov/SourceCoverageView.h b/llvm/tools/llvm-cov/SourceCoverageView.h index 21672f5..9cb608f 100644 --- a/llvm/tools/llvm-cov/SourceCoverageView.h +++ b/llvm/tools/llvm-cov/SourceCoverageView.h @@ -57,15 +57,6 @@ struct InstantiationView { InstantiationView(StringRef FunctionName, unsigned Line, std::unique_ptr View) : FunctionName(FunctionName), Line(Line), View(std::move(View)) {} - InstantiationView(InstantiationView &&RHS) - : FunctionName(std::move(RHS.FunctionName)), Line(std::move(RHS.Line)), - View(std::move(RHS.View)) {} - InstantiationView &operator=(InstantiationView &&RHS) { - FunctionName = std::move(RHS.FunctionName); - Line = std::move(RHS.Line); - View = std::move(RHS.View); - return *this; - } friend bool operator<(const InstantiationView &LHS, const InstantiationView &RHS) { -- 2.7.4