fix some warnings on VC++, patch by John Thompson!

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68391 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/AST/ASTContext.h b/include/clang/AST/ASTContext.h
index 4287494b3d371c35c891309151c1864d80c398aa..77fa994e740813d1f2d9519da50f4060a4a22a05 100644 (file)
--- a/include/clang/AST/ASTContext.h
+++ b/include/clang/AST/ASTContext.h
@@ -758,7 +758,7 @@ inline void *operator new(size_t Bytes, clang::ASTContext &C,
 /// invoking it directly; see the new operator for more details. This operator
 /// is called implicitly by the compiler if a placement new expression using
 /// the ASTContext throws in the object constructor.
-inline void operator delete(void *Ptr, clang::ASTContext &C)
+inline void operator delete(void *Ptr, clang::ASTContext &C, size_t)
               throw () {
   C.Deallocate(Ptr);
 }

diff --git a/include/clang/AST/Stmt.h b/include/clang/AST/Stmt.h
index 25217215f5f0a0dcc991fab925b02e06045c8818..11023234b040641598d30aee9a299c322915f37c 100644 (file)
--- a/include/clang/AST/Stmt.h
+++ b/include/clang/AST/Stmt.h
@@ -131,9 +131,10 @@ public:
     return mem;
   }
 
-  void operator delete(void*, ASTContext& C) throw() { }
-  void operator delete(void*, ASTContext& C, unsigned alignment) throw() { }
+  void operator delete(void*, ASTContext&, unsigned) throw() { }
+  void operator delete(void*, ASTContext*, unsigned) throw() { }
   void operator delete(void*, std::size_t) throw() { }
+  void operator delete(void*, void*) throw() { }
 
 protected:
   /// DestroyChildren - Invoked by destructors of subclasses of Stmt to