aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2012-09-28 07:17:01 +0000
committerCraig Topper <craig.topper@gmail.com>2012-09-28 07:17:01 +0000
commit8bb12aeeb4f38f62f2d97618d0c688f47c9bd972 (patch)
tree1dc26f69ea87b7fc5f199edae7bd7dc09212b8ee
parentc94a38ff1732b960a551c7c1a4c50ede5c4737b4 (diff)
downloadexternal_llvm-8bb12aeeb4f38f62f2d97618d0c688f47c9bd972.zip
external_llvm-8bb12aeeb4f38f62f2d97618d0c688f47c9bd972.tar.gz
external_llvm-8bb12aeeb4f38f62f2d97618d0c688f47c9bd972.tar.bz2
Remove a LLVM_DELETED_FUNCTION from destructor to fix -std=c++11 build on gcc 4.7.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@164813 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/Operator.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/llvm/Operator.h b/include/llvm/Operator.h
index cf6d8e2..6cc8231 100644
--- a/include/llvm/Operator.h
+++ b/include/llvm/Operator.h
@@ -35,7 +35,9 @@ private:
void *operator new(size_t, unsigned) LLVM_DELETED_FUNCTION;
void *operator new(size_t s) LLVM_DELETED_FUNCTION;
Operator() LLVM_DELETED_FUNCTION;
- ~Operator() LLVM_DELETED_FUNCTION;
+ // NOTE: cannot use LLVM_DELETED_FUNCTION because gcc errors when deleting
+ // an override of a non-deleted function.
+ ~Operator();
public:
/// getOpcode - Return the opcode for this Instruction or ConstantExpr.