Merge from mainline.

git-svn-id: http://llvm.org/svn/llvm-project/llvm/branches/release_23@51444 91177308-0d34-0410-b5e6-96231b3b80d8
earl · May 22, 2008 · 13c30b2 · 13c30b2
1 parent c6162ec
commit 13c30b2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/include/llvm/User.h b/include/llvm/User.h
@@ -46,6 +46,11 @@ class User : public Value {
     : Value(Ty, vty), OperandList(OpList), NumOperands(NumOps) {}
 
 public:
+  /// placement delete - required by std, but never called.
+  void operator delete(void*, size_t) {
+    assert(0 && "Constructor throws?");
+  }
+
   Value *getOperand(unsigned i) const {
     assert(i < NumOperands && "getOperand() out of range!");
     return OperandList[i];