From 188a786d3b21c25bb30764861424328ae0f322d7 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 11 Nov 2009 16:20:06 -0500 Subject: [PATCH] call.c (build_op_delete_call): Downgrade error about placement/non-placement confusion to permerror. * call.c (build_op_delete_call): Downgrade error about placement/non-placement confusion to permerror. From-SVN: r154106 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/call.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2407446de06..80948b1ce44 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2009-11-11 Jason Merrill + + * call.c (build_op_delete_call): Downgrade error about + placement/non-placement confusion to permerror. + 2009-11-10 Jason Merrill * call.c (build_op_delete_call): Tweak error. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index efee604f1c2..db609f8015e 100644 --- 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