aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/parser.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 48a4613..d02bff4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-02 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ * parser.c (cp_parser_mem_initializer_list): Change error text.
+
2010-06-02 Jakub Jelinek <jakub@redhat.com>
* cp-objcp-common.c (shadowed_var_for_decl): Change into
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 4a50b55..05d713c 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -10136,7 +10136,7 @@ cp_parser_mem_initializer_list (cp_parser* parser)
mem-initializer-list. */
if (!DECL_CONSTRUCTOR_P (current_function_decl))
error_at (token->location,
- "only constructors take base initializers");
+ "only constructors take member initializers");
/* Loop through the list. */
while (true)