From 80c1239f1baf2b8b817808d8f13029269ba290a8 Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron@aaronballman.com>
Date: Sun, 15 Feb 2015 23:10:05 +0000
Subject: [PATCH] Removing LLVM_DELETED_FUNCTION, as MSVC 2012 was the last
 reason for requiring the macro. NFC; lld edition.

llvm-svn: 229341
---
 lld/include/lld/Core/Instrumentation.h           |  4 ++--
 lld/include/lld/Driver/Driver.h                  | 12 ++++++------
 lld/include/lld/ReaderWriter/ELFLinkingContext.h |  2 +-
 lld/include/lld/ReaderWriter/LinkerScript.h      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lld/include/lld/Core/Instrumentation.h b/lld/include/lld/Core/Instrumentation.h
index 46a04ea..1623759 100644
--- a/lld/include/lld/Core/Instrumentation.h
+++ b/lld/include/lld/Core/Instrumentation.h
@@ -64,8 +64,8 @@ public:
 class ScopedTask {
   __itt_domain *_domain;
 
-  ScopedTask(const ScopedTask &) LLVM_DELETED_FUNCTION;
-  ScopedTask &operator=(const ScopedTask &) LLVM_DELETED_FUNCTION;
+  ScopedTask(const ScopedTask &) = delete;
+  ScopedTask &operator=(const ScopedTask &) = delete;
 
 public:
   /// \brief Create a task in Domain \p d named \p s.
diff --git a/lld/include/lld/Driver/Driver.h b/lld/include/lld/Driver/Driver.h
index 188e38d..71ab459 100644
--- a/lld/include/lld/Driver/Driver.h
+++ b/lld/include/lld/Driver/Driver.h
@@ -47,7 +47,7 @@ protected:
                    raw_ostream &diag = llvm::errs());
 
 private:
-  Driver() LLVM_DELETED_FUNCTION;
+  Driver() = delete;
 };
 
 /// Driver for "universal" lld tool which can mimic any linker command line
@@ -59,7 +59,7 @@ public:
                    raw_ostream &diag = llvm::errs());
 
 private:
-  UniversalDriver() LLVM_DELETED_FUNCTION;
+  UniversalDriver() = delete;
 };
 
 /// Driver for gnu/binutil 'ld' command line options.
@@ -95,7 +95,7 @@ private:
                                     llvm::Triple &triple,
                                     llvm::Triple &baseTriple);
 
-  GnuLdDriver() LLVM_DELETED_FUNCTION;
+  GnuLdDriver() = delete;
 };
 
 /// Driver for darwin/ld64 'ld' command line options.
@@ -112,7 +112,7 @@ public:
                     raw_ostream &diag = llvm::errs());
 
 private:
-  DarwinLdDriver() LLVM_DELETED_FUNCTION;
+  DarwinLdDriver() = delete;
 };
 
 /// Driver for Windows 'link.exe' command line options
@@ -139,7 +139,7 @@ public:
   }
 
 private:
-  WinLinkDriver() LLVM_DELETED_FUNCTION;
+  WinLinkDriver() = delete;
 };
 
 /// Driver for lld unit tests
@@ -156,7 +156,7 @@ public:
                     raw_ostream &diag = llvm::errs());
 
 private:
-  CoreDriver() LLVM_DELETED_FUNCTION;
+  CoreDriver() = delete;
 };
 
 } // end namespace lld
diff --git a/lld/include/lld/ReaderWriter/ELFLinkingContext.h b/lld/include/lld/ReaderWriter/ELFLinkingContext.h
index a4eae3ca..7eef6da 100644
--- a/lld/include/lld/ReaderWriter/ELFLinkingContext.h
+++ b/lld/include/lld/ReaderWriter/ELFLinkingContext.h
@@ -303,7 +303,7 @@ public:
   const llvm::StringSet<> &wrapCalls() const { return _wrapCalls; }
 
 private:
-  ELFLinkingContext() LLVM_DELETED_FUNCTION;
+  ELFLinkingContext() = delete;
 
 protected:
   ELFLinkingContext(llvm::Triple, std::unique_ptr<TargetHandlerBase>);
diff --git a/lld/include/lld/ReaderWriter/LinkerScript.h b/lld/include/lld/ReaderWriter/LinkerScript.h
index c1f6bd0..689b58b 100644
--- a/lld/include/lld/ReaderWriter/LinkerScript.h
+++ b/lld/include/lld/ReaderWriter/LinkerScript.h
@@ -762,7 +762,7 @@ public:
 
   /// Let's not allow copying of Parser class because it would be expensive
   /// to update all the AST pointers to a new buffer.
-  Parser(const Parser &instance) LLVM_DELETED_FUNCTION;
+  Parser(const Parser &instance) = delete;
 
   /// Lex and parse the current memory buffer to create a linker script AST.
   std::error_code parse();
-- 
2.7.4