diff options
author | Aaron Ballman <aaron@aaronballman.com> | 2015-02-15 22:54:22 +0000 |
---|---|---|
committer | Aaron Ballman <aaron@aaronballman.com> | 2015-02-15 22:54:22 +0000 |
commit | f9a1897c72e172044af4889cd50a7dcd5047947b (patch) | |
tree | 3f899ea1559e5113a0ff75938f17af5b29741a85 /llvm/lib/Transforms | |
parent | abc18920577c85c45458ee9de7dfec2d3ee54cef (diff) | |
download | bcm5719-llvm-f9a1897c72e172044af4889cd50a7dcd5047947b.tar.gz bcm5719-llvm-f9a1897c72e172044af4889cd50a7dcd5047947b.zip |
Removing LLVM_DELETED_FUNCTION, as MSVC 2012 was the last reason for requiring the macro. NFC; LLVM edition.
llvm-svn: 229340
Diffstat (limited to 'llvm/lib/Transforms')
-rw-r--r-- | llvm/lib/Transforms/ObjCARC/ProvenanceAnalysis.h | 4 | ||||
-rw-r--r-- | llvm/lib/Transforms/Scalar/EarlyCSE.cpp | 8 | ||||
-rw-r--r-- | llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/llvm/lib/Transforms/ObjCARC/ProvenanceAnalysis.h b/llvm/lib/Transforms/ObjCARC/ProvenanceAnalysis.h index 782046812f0..4b5f4d8575b 100644 --- a/llvm/lib/Transforms/ObjCARC/ProvenanceAnalysis.h +++ b/llvm/lib/Transforms/ObjCARC/ProvenanceAnalysis.h @@ -57,8 +57,8 @@ class ProvenanceAnalysis { bool relatedSelect(const SelectInst *A, const Value *B); bool relatedPHI(const PHINode *A, const Value *B); - void operator=(const ProvenanceAnalysis &) LLVM_DELETED_FUNCTION; - ProvenanceAnalysis(const ProvenanceAnalysis &) LLVM_DELETED_FUNCTION; + void operator=(const ProvenanceAnalysis &) = delete; + ProvenanceAnalysis(const ProvenanceAnalysis &) = delete; public: ProvenanceAnalysis() {} diff --git a/llvm/lib/Transforms/Scalar/EarlyCSE.cpp b/llvm/lib/Transforms/Scalar/EarlyCSE.cpp index 862622f5932..9309623380f 100644 --- a/llvm/lib/Transforms/Scalar/EarlyCSE.cpp +++ b/llvm/lib/Transforms/Scalar/EarlyCSE.cpp @@ -328,8 +328,8 @@ private: CallScope(AvailableCalls) {} private: - NodeScope(const NodeScope &) LLVM_DELETED_FUNCTION; - void operator=(const NodeScope &) LLVM_DELETED_FUNCTION; + NodeScope(const NodeScope &) = delete; + void operator=(const NodeScope &) = delete; ScopedHTType::ScopeTy Scope; LoadHTType::ScopeTy LoadScope; @@ -365,8 +365,8 @@ private: void process() { Processed = true; } private: - StackNode(const StackNode &) LLVM_DELETED_FUNCTION; - void operator=(const StackNode &) LLVM_DELETED_FUNCTION; + StackNode(const StackNode &) = delete; + void operator=(const StackNode &) = delete; // Members. unsigned CurrentGeneration; diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 6717be15db9..9d3a5bb6454 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -359,10 +359,9 @@ struct ConstantComparesGatherer { } /// Prevent copy - ConstantComparesGatherer(const ConstantComparesGatherer &) - LLVM_DELETED_FUNCTION; + ConstantComparesGatherer(const ConstantComparesGatherer &) = delete; ConstantComparesGatherer & - operator=(const ConstantComparesGatherer &) LLVM_DELETED_FUNCTION; + operator=(const ConstantComparesGatherer &) = delete; private: |