diff options
| author | Jason Merrill <jason@redhat.com> | 2009-11-11 16:20:06 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-11-11 16:20:06 -0500 |
| commit | 188a786d3b21c25bb30764861424328ae0f322d7 (patch) | |
| tree | c04d03b4b24a150087a27a05fee97e53db0e1d33 | |
| parent | 811232fe06c205ffaab2f41c8701d974947ac05d (diff) | |
| download | gcc-188a786d3b21c25bb30764861424328ae0f322d7.zip gcc-188a786d3b21c25bb30764861424328ae0f322d7.tar.gz gcc-188a786d3b21c25bb30764861424328ae0f322d7.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2407446..80948b1 100644 --- 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 efee604f..db609f8 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 |