From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 2 Jun 2010 22:37:28 +0000 (+0000)
Subject: 2010-06-02  Jonathan Wakely  <jwakely.gcc@gmail.com>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d653ac31d03d8dab08d2e77947bfeaed96f1986b;p=thirdparty%2Fgcc.git

2010-06-02  Jonathan Wakely  <jwakely.gcc@gmail.com>

	* parser.c (cp_parser_mem_initializer_list): Change error text.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160198 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 48a4613b4771..d02bff462ff0 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 4a50b556f461..05d713c41c1f 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)