summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2008-05-22 13:16:42 +0000
committerGabor Greif <ggreif@gmail.com>2008-05-22 13:16:42 +0000
commit6fb9d682066d892ba70b9fe0d6a770500b1e597e (patch)
tree1804e7b906eb18b6ee6a1c46b6b390002174ab7a
parentbb5de96bc857d525b1dbd416ba57693a08337494 (diff)
downloadbcm5719-llvm-6fb9d682066d892ba70b9fe0d6a770500b1e597e.tar.gz
bcm5719-llvm-6fb9d682066d892ba70b9fe0d6a770500b1e597e.zip
Suppress warnings about missing placement delete. This should now be std-conformant even if compiled with exceptions on.
llvm-svn: 51429
-rw-r--r--llvm/include/llvm/User.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/llvm/include/llvm/User.h b/llvm/include/llvm/User.h
index 31d71fbf10e..23967c7420b 100644
--- a/llvm/include/llvm/User.h
+++ b/llvm/include/llvm/User.h
@@ -242,7 +242,12 @@ public:
~User() {
Use::zap(OperandList, OperandList + NumOperands);
}
+ /// operator delete - free memory allocated for User and Use objects
void operator delete(void *Usr);
+ /// placement delete - required by std, but never called.
+ void operator delete(void*, unsigned) {
+ assert(0 && "Constructor throws?");
+ }
template <unsigned Idx> Use &Op() {
return OperandTraits<User>::op_begin(this)[Idx];
}
OpenPOWER on IntegriCloud