diff options
| author | Craig Topper <craig.topper@gmail.com> | 2012-09-28 07:17:01 +0000 |
|---|---|---|
| committer | Craig Topper <craig.topper@gmail.com> | 2012-09-28 07:17:01 +0000 |
| commit | 8ffb55b2abe9af246f7ed1e0c5290ac1ff5f5a88 (patch) | |
| tree | bd4b65eb65c2cea4927200b61ebaedef816b0396 | |
| parent | f49306a2c6fd1e6df158074468d54ee212b87d3a (diff) | |
| download | bcm5719-llvm-8ffb55b2abe9af246f7ed1e0c5290ac1ff5f5a88.tar.gz bcm5719-llvm-8ffb55b2abe9af246f7ed1e0c5290ac1ff5f5a88.zip | |
Remove a LLVM_DELETED_FUNCTION from destructor to fix -std=c++11 build on gcc 4.7.
llvm-svn: 164813
| -rw-r--r-- | llvm/include/llvm/Operator.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/include/llvm/Operator.h b/llvm/include/llvm/Operator.h index cf6d8e2c379..6cc82310fe2 100644 --- a/llvm/include/llvm/Operator.h +++ b/llvm/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. |
