summaryrefslogtreecommitdiffstats
path: root/llvm/unittests/ADT/SmallVectorTest.cpp
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2015-02-15 22:54:22 +0000
committerAaron Ballman <aaron@aaronballman.com>2015-02-15 22:54:22 +0000
commitf9a1897c72e172044af4889cd50a7dcd5047947b (patch)
tree3f899ea1559e5113a0ff75938f17af5b29741a85 /llvm/unittests/ADT/SmallVectorTest.cpp
parentabc18920577c85c45458ee9de7dfec2d3ee54cef (diff)
downloadbcm5719-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/unittests/ADT/SmallVectorTest.cpp')
-rw-r--r--llvm/unittests/ADT/SmallVectorTest.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/unittests/ADT/SmallVectorTest.cpp b/llvm/unittests/ADT/SmallVectorTest.cpp
index 170a30bbac6..2bbb4ed8438 100644
--- a/llvm/unittests/ADT/SmallVectorTest.cpp
+++ b/llvm/unittests/ADT/SmallVectorTest.cpp
@@ -144,8 +144,8 @@ struct NonCopyable {
NonCopyable(NonCopyable &&) {}
NonCopyable &operator=(NonCopyable &&) { return *this; }
private:
- NonCopyable(const NonCopyable &) LLVM_DELETED_FUNCTION;
- NonCopyable &operator=(const NonCopyable &) LLVM_DELETED_FUNCTION;
+ NonCopyable(const NonCopyable &) = delete;
+ NonCopyable &operator=(const NonCopyable &) = delete;
};
LLVM_ATTRIBUTE_USED void CompileTest() {
@@ -786,8 +786,8 @@ template <int I> struct EmplaceableArg {
explicit EmplaceableArg(bool) : State(EAS_Arg) {}
private:
- EmplaceableArg &operator=(EmplaceableArg &&) LLVM_DELETED_FUNCTION;
- EmplaceableArg &operator=(const EmplaceableArg &) LLVM_DELETED_FUNCTION;
+ EmplaceableArg &operator=(EmplaceableArg &&) = delete;
+ EmplaceableArg &operator=(const EmplaceableArg &) = delete;
};
enum EmplaceableState { ES_Emplaced, ES_Moved };
@@ -827,8 +827,8 @@ struct Emplaceable {
}
private:
- Emplaceable(const Emplaceable &) LLVM_DELETED_FUNCTION;
- Emplaceable &operator=(const Emplaceable &) LLVM_DELETED_FUNCTION;
+ Emplaceable(const Emplaceable &) = delete;
+ Emplaceable &operator=(const Emplaceable &) = delete;
};
TEST(SmallVectorTest, EmplaceBack) {
OpenPOWER on IntegriCloud