aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/call.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6087ed7..2407446 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,4 +1,6 @@
-2009-11-09 Jason Merrill <jason@redhat.com>
+2009-11-10 Jason Merrill <jason@redhat.com>
+
+ * call.c (build_op_delete_call): Tweak error.
PR c++/34158
PR c++/36406
@@ -8,6 +10,8 @@
* pt.c (primary_template_instantiation_p): Non-static.
* cp-tree.h: Declare it.
+2009-11-09 Jason Merrill <jason@redhat.com>
+
PR c++/41972
* parser.c (cp_parser_template_argument): Accept SCOPE_REF around
VAR_DECL.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 1cd3fc2..efee604f 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4613,8 +4613,10 @@ build_op_delete_call (enum tree_code code, tree addr, tree size,
deallocation function, would have been selected as a match for the
allocation function, the program is ill-formed." */
if (non_placement_deallocation_fn_p (fn))
- error ("non-placement deallocation function %qD selected for "
- "placement delete", fn);
+ {
+ error ("non-placement deallocation function %q+D", fn);
+ error ("selected for placement delete");
+ }
}
else
/* "Any non-placement deallocation function matches a non-placement