From c0b16a7045b506a7abd51a26f9ed003a169a37c0 Mon Sep 17 00:00:00 2001
From: Mark Mitchell <mark@codesourcery.com>
Date: Tue, 11 Oct 2005 20:53:55 +0000
Subject: [PATCH] re PR c++/21369 (Template function definition rejected if
 function return type begins with 'struct')

	PR c++/21369
	* g++.dg/init/member1.C: Tweak error markers.

From-SVN: r105252
---
 gcc/testsuite/ChangeLog             | 5 +++++
 gcc/testsuite/g++.dg/init/member1.C | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 31a05749e2b..9f1a795ca51 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-11  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/21369
+	* g++.dg/init/member1.C: Tweak error markers.
+
 2005-10-11  Janis Johnson  <janis187@us.ibm.com>
 
 	PR testsuite/24281
diff --git a/gcc/testsuite/g++.dg/init/member1.C b/gcc/testsuite/g++.dg/init/member1.C
index aededf23e7b..b5ffbd7bd39 100644
--- a/gcc/testsuite/g++.dg/init/member1.C
+++ b/gcc/testsuite/g++.dg/init/member1.C
@@ -11,7 +11,7 @@ template<int> struct B {};
 template<typename T> struct C
 {
   static const int i = A<T>::i;  // { dg-error "incomplete" }
-  static const int j = i;
+  static const int j = i; // { dg-error "constant" }
   B<j> b;  // { dg-error "not a valid template arg" }
 };
 
-- 
2.30.2