From: Jason Merrill <jason@yorick.cygnus.com>
Date: Tue, 24 Feb 1998 00:37:57 +0000 (+0000)
Subject: * typeck2.c (process_init_constructor): Fix labeled init check.
X-Git-Tag: prereleases/egcs-1.1-prerelease~2267
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c3e25ebe24f8b757d68fdfcff6c46238d24efa4;p=thirdparty%2Fgcc.git

* typeck2.c (process_init_constructor): Fix labeled init check.

From-SVN: r18214
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d4f4fee74f3a..75ff86cdd053 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 24 00:36:43 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* typeck2.c (process_init_constructor): Fix labeled init check.
+
 Mon Feb 23 05:08:55 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* pt.c, call.c, decl.c, method.c, cp-tree.h: Remove unused NARGS
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 35dccd75f2a5..21f90cb51e85 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1044,6 +1044,7 @@ process_init_constructor (type, init, elts)
 	    continue;
 
 	  if (TREE_PURPOSE (tail)
+	      && TREE_PURPOSE (tail) != field
 	      && TREE_PURPOSE (tail) != DECL_NAME (field))
 	    sorry ("non-trivial labeled initializers");