From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 7 Apr 2010 15:54:17 +0000 (+0000)
Subject: 	PR c++/41970
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=808b6adb41a7bca7f1a139ae944b469f61aa15c3

	PR c++/41970
	* decl.c (grokvardecl): Tweak warning message.
	(grokfndecl): Likewise.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3d412443a7b..a6e6f3a85e8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-07  Jason Merrill  <jason@redhat.com>
+
+	PR c++/41970
+	* decl.c (grokvardecl): Tweak warning message.
+	(grokfndecl): Likewise.
+
 2010-04-07  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/42697
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0032dd813b0..3138c8a3d1c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-07  Jason Merrill  <jason@redhat.com>
+
+	PR c++/41970
+	* g++.old-deja/g++.other/linkage1.C: Adjust.
+
 2010-04-07  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/42697