[cfe-commits] r112298 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td test/SemaCXX/new-delete.cpp

[Douglas Gregor]

Author: dgregor
Date: Fri Aug 27 16:39:15 2010
New Revision: 112298

URL: http://llvm.org/viewvc/llvm-project?rev=112298&view=rev
Log:
Improve wording of diagnostic complaining about a non-void* pointer as the first parameter of operator delete

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/trunk/test/SemaCXX/new-delete.cpp

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=112298&r1=112297&r2=112298&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Fri Aug 27 16:39:15 2010
@@ -2941,7 +2941,7 @@
 def err_operator_delete_dependent_param_type : Error<
   "%0 cannot take a dependent type as first parameter; use %1 instead">;
 def err_operator_delete_param_type : Error<
-  "%0 takes type %1 as first parameter">;
+  "first parameter of %0 must have type %1">;
 
 // C++ literal operators
 def err_literal_operator_outside_namespace : Error<

Modified: cfe/trunk/test/SemaCXX/new-delete.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/new-delete.cpp?rev=112298&r1=112297&r2=112298&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/new-delete.cpp (original)
+++ cfe/trunk/test/SemaCXX/new-delete.cpp Fri Aug 27 16:39:15 2010
@@ -344,3 +344,13 @@
     template<class T> void operator delete(void*, const size_t, const int, T*);
   };
 }
+
+namespace DeleteParam {
+  struct X {
+    void operator delete(X*); // expected-error{{first parameter of 'operator delete' must have type 'void *'}}
+  };
+
+  struct Y {
+    void operator delete(void* const);
+  };
+}