call.c (build_op_delete_call): Downgrade error about placement/non-placement confusio...

	* call.c (build_op_delete_call): Downgrade error about
	placement/non-placement confusion to permerror.

From-SVN: r154106

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2407446..80948b1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-11  Jason Merrill  <jason@redhat.com>
+
+       * call.c (build_op_delete_call): Downgrade error about
+       placement/non-placement confusion to permerror.
+
 2009-11-10  Jason Merrill  <jason@redhat.com>
 
        * call.c (build_op_delete_call): Tweak error.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index efee604..db609f8 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4614,8 +4614,8 @@ build_op_delete_call (enum tree_code code, tree addr, tree size,
         allocation function, the program is ill-formed."  */
       if (non_placement_deallocation_fn_p (fn))
        {
-         error ("non-placement deallocation function %q+D", fn);
-         error ("selected for placement delete");
+         permerror (0, "non-placement deallocation function %q+D", fn);
+         permerror (input_location, "selected for placement delete");
        }
     }
   else